guzijian / wvp-GB28181-pro · Commits

Commit ab34cb37f33f8a64df206c18d7fc5b970be5d0cb

Authored by 648540858
1 parent 695f9b7f

修复空指针异常

Inline Side-by-side
Showing 2 changed files with 6 additions and 0 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @ab34cb3
@@ -611,6 +611,10 @@ public class SIPCommander implements ISIPCommander { @@ -611,6 +611,10 @@ public class SIPCommander implements ISIPCommander {
611 */ 611 */
612 @Override 612 @Override
613 public void streamByeCmd(Device device, String channelId, String stream, String callId, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException, SsrcTransactionNotFoundException { 613 public void streamByeCmd(Device device, String channelId, String stream, String callId, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException, SsrcTransactionNotFoundException {
  614 + if (device == null) {
  615 + logger.warn("[发送BYE] device为null");
  616 + return;
  617 + }
614 SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(device.getDeviceId(), channelId, callId, stream); 618 SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(device.getDeviceId(), channelId, callId, stream);
615 if (ssrcTransaction == null) { 619 if (ssrcTransaction == null) {
616 throw new SsrcTransactionNotFoundException(device.getDeviceId(), channelId, callId, stream); 620 throw new SsrcTransactionNotFoundException(device.getDeviceId(), channelId, callId, stream);
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
  View file @ab34cb3
1 package com.genersoft.iot.vmp.storager.impl; 1 package com.genersoft.iot.vmp.storager.impl;
2 2
  3 +import com.baomidou.dynamic.datasource.annotation.DS;
3 import com.genersoft.iot.vmp.conf.SipConfig; 4 import com.genersoft.iot.vmp.conf.SipConfig;
4 import com.genersoft.iot.vmp.conf.UserSetting; 5 import com.genersoft.iot.vmp.conf.UserSetting;
5 import com.genersoft.iot.vmp.gb28181.bean.*; 6 import com.genersoft.iot.vmp.gb28181.bean.*;
@@ -38,6 +39,7 @@ import java.util.concurrent.ConcurrentHashMap; @@ -38,6 +39,7 @@ import java.util.concurrent.ConcurrentHashMap;
38 */ 39 */
39 @SuppressWarnings("rawtypes") 40 @SuppressWarnings("rawtypes")
40 @Component 41 @Component
  42 +@DS("master")
41 public class VideoManagerStorageImpl implements IVideoManagerStorage { 43 public class VideoManagerStorageImpl implements IVideoManagerStorage {
42 44
43 private final Logger logger = LoggerFactory.getLogger(VideoManagerStorageImpl.class); 45 private final Logger logger = LoggerFactory.getLogger(VideoManagerStorageImpl.class);