Commit d739bfa5976e36ced26f906ab16f83c20c8cb27c

Authored by xiaoxie
1 parent 07fa589e

处理冲突

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
... ... @@ -73,7 +73,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
73 73 ExpiresHeader expiresHeader = (ExpiresHeader) request.getHeader(Expires.NAME);
74 74 Response response = null;
75 75 boolean passwordCorrect = false;
76   - // 注册标志 true:注册成功 false:注册成功
  76 + // 注册标志
77 77 boolean registerFlag = false;
78 78 FromHeader fromHeader = (FromHeader) request.getHeader(FromHeader.NAME);
79 79 AddressImpl address = (AddressImpl) fromHeader.getAddress();
... ...