Commit d568a18e0a3e9cfc54175961db66ee659c8f057d

Authored by Lawrence
1 parent dc1d9646

与master分支同步

src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -121,7 +121,9 @@ public class SipLayer implements SipListener { @@ -121,7 +121,9 @@ public class SipLayer implements SipListener {
121 logger.debug(evt.getRequest().toString()); 121 logger.debug(evt.getRequest().toString());
122 // 由于jainsip是单线程程序,为提高性能并发处理 122 // 由于jainsip是单线程程序,为提高性能并发处理
123 processThreadPool.execute(() -> { 123 processThreadPool.execute(() -> {
124 - processorFactory.createRequestProcessor(evt).process(); 124 + if (processorFactory != null) {
  125 + processorFactory.createRequestProcessor(evt).process();
  126 + }
125 }); 127 });
126 } 128 }
127 129
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
@@ -66,5 +66,4 @@ public interface DeviceMapper { @@ -66,5 +66,4 @@ public interface DeviceMapper {
66 66
67 @Delete("DELETE FROM device WHERE deviceId=#{deviceId}") 67 @Delete("DELETE FROM device WHERE deviceId=#{deviceId}")
68 int del(String deviceId); 68 int del(String deviceId);
69 -  
70 } 69 }