guzijian / wvp-GB28181-pro · Commits

Commit bf97908c5eebc3fdd319e2e7ebc67df30ba7af86

Authored by 648540858
Committed by GitHub
2 parents d176b523 0cc5917d

Merge pull request #626 from 648540858/wvp-dialog 

合并bug修复
Inline Side-by-side
Showing 4 changed files with 4 additions and 20 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
  View file @bf97908
@@ -124,10 +124,9 @@ public class NotifyRequestProcessor extends SIPRequestProcessorParent implements @@ -124,10 +124,9 @@ public class NotifyRequestProcessor extends SIPRequestProcessorParent implements
124 } 124 }
125 } catch (DocumentException e) { 125 } catch (DocumentException e) {
126 logger.error("处理NOTIFY消息时错误", e); 126 logger.error("处理NOTIFY消息时错误", e);
127 - } finally {  
128 - taskQueueHandlerRun = false;  
129 } 127 }
130 } 128 }
  129 + taskQueueHandlerRun = false;
131 }); 130 });
132 } 131 }
133 } catch (SipException | InvalidArgumentException | ParseException e) { 132 } catch (SipException | InvalidArgumentException | ParseException e) {
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
  View file @bf97908
@@ -56,24 +56,8 @@ public class CatalogResponseMessageHandler extends SIPRequestProcessorParent imp @@ -56,24 +56,8 @@ public class CatalogResponseMessageHandler extends SIPRequestProcessorParent imp
56 private IVideoManagerStorage storager; 56 private IVideoManagerStorage storager;
57 57
58 @Autowired 58 @Autowired
59 - private DeferredResultHolder deferredResultHolder;  
60 -  
61 - @Autowired  
62 private CatalogDataCatch catalogDataCatch; 59 private CatalogDataCatch catalogDataCatch;
63 60
64 - @Autowired  
65 - private SipConfig config;  
66 -  
67 - @Autowired  
68 - private EventPublisher publisher;  
69 -  
70 - //by brewswang  
71 - @Autowired  
72 - private UserSetting userSetting;  
73 -  
74 - @Autowired  
75 - private IRedisCatchStorage redisCatchStorage;  
76 -  
77 @Qualifier("taskExecutor") 61 @Qualifier("taskExecutor")
78 @Autowired 62 @Autowired
79 private ThreadPoolTaskExecutor taskExecutor; 63 private ThreadPoolTaskExecutor taskExecutor;
@@ -153,6 +137,7 @@ public class CatalogResponseMessageHandler extends SIPRequestProcessorParent imp @@ -153,6 +137,7 @@ public class CatalogResponseMessageHandler extends SIPRequestProcessorParent imp
153 137
154 } 138 }
155 } 139 }
  140 + taskQueueHandlerRun = false;
156 }); 141 });
157 } 142 }
158 143
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java
  View file @bf97908
@@ -148,10 +148,9 @@ public class RecordInfoResponseMessageHandler extends SIPRequestProcessorParent @@ -148,10 +148,9 @@ public class RecordInfoResponseMessageHandler extends SIPRequestProcessorParent
148 } 148 }
149 } catch (DocumentException e) { 149 } catch (DocumentException e) {
150 logger.error("xml解析异常： ", e); 150 logger.error("xml解析异常： ", e);
151 - } finally {  
152 - taskQueueHandlerRun = false;  
153 } 151 }
154 } 152 }
  153 + taskQueueHandlerRun = false;
155 }); 154 });
156 } 155 }
157 156
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
  View file @bf97908
@@ -18,6 +18,7 @@ import org.springframework.util.ObjectUtils; @@ -18,6 +18,7 @@ import org.springframework.util.ObjectUtils;
18 18
19 import javax.sip.InvalidArgumentException; 19 import javax.sip.InvalidArgumentException;
20 import javax.sip.SipException; 20 import javax.sip.SipException;
  21 +import javax.validation.constraints.NotNull;
21 import java.text.ParseException; 22 import java.text.ParseException;
22 import java.util.List; 23 import java.util.List;
23 import java.util.concurrent.ConcurrentLinkedQueue; 24 import java.util.concurrent.ConcurrentLinkedQueue;