From 0da452293f15be019bf23923148691ca133e43b0 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 23 六月 2022 10:14:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 --- src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java index 3d817c3..c6cfc7a 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java @@ -88,8 +88,8 @@ this.type = "timeout"; this.msg = "娑堟伅瓒呮椂鏈洖澶�"; this.statusCode = -1024; - this.callId = timeoutEvent.getClientTransaction().getDialog().getCallId().getCallId(); this.dialog = timeoutEvent.getClientTransaction().getDialog(); + this.callId = this.dialog != null?timeoutEvent.getClientTransaction().getDialog().getCallId().getCallId(): null; }else if (event instanceof TransactionTerminatedEvent) { TransactionTerminatedEvent transactionTerminatedEvent = (TransactionTerminatedEvent)event; this.type = "transactionTerminated"; @@ -109,8 +109,8 @@ this.type = "deviceNotFoundEvent"; this.msg = "璁惧鏈壘鍒�"; this.statusCode = -1024; - this.callId = deviceNotFoundEvent.getDialog().getCallId().getCallId(); this.dialog = deviceNotFoundEvent.getDialog(); + this.callId = this.dialog != null ?deviceNotFoundEvent.getDialog().getCallId().getCallId() : null; } } } @@ -130,6 +130,9 @@ } public void removeErrorSubscribe(String key) { + if(key == null){ + return; + } errorSubscribes.remove(key); errorTimeSubscribes.remove(key); } @@ -139,6 +142,9 @@ } public void removeOkSubscribe(String key) { + if(key == null){ + return; + } okSubscribes.remove(key); okTimeSubscribes.remove(key); } -- Gitblit v1.8.0