From 47abdde3392f2c5fd88d382ae63c4756b97ed4b0 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 03 六月 2022 16:24:11 +0800
Subject: [PATCH] 解决设备上线停止线程导致的报错,优化录像的获取以及通道的更新

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
index a06a73d..a2fab81 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorObserver.java
@@ -150,30 +150,24 @@
     public void processTimeout(TimeoutEvent timeoutEvent) {
         logger.info("[娑堟伅鍙戦�佽秴鏃禲");
         ClientTransaction clientTransaction = timeoutEvent.getClientTransaction();
-        eventPublisher.requestTimeOut(timeoutEvent);
+
         if (clientTransaction != null) {
+            logger.info("[鍙戦�侀敊璇闃匽 clientTransaction != null");
             Request request = clientTransaction.getRequest();
             if (request != null) {
+                logger.info("[鍙戦�侀敊璇闃匽 request != null");
                 CallIdHeader callIdHeader = (CallIdHeader) request.getHeader(CallIdHeader.NAME);
                 if (callIdHeader != null) {
+                    logger.info("[鍙戦�侀敊璇闃匽");
                     SipSubscribe.Event subscribe = sipSubscribe.getErrorSubscribe(callIdHeader.getCallId());
                     SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(timeoutEvent);
                     subscribe.response(eventResult);
+                    sipSubscribe.removeOkSubscribe(callIdHeader.getCallId());
                     sipSubscribe.removeErrorSubscribe(callIdHeader.getCallId());
                 }
             }
         }
-
-//        Timeout timeout = timeoutEvent.getTimeout();
-//        ServerTransaction serverTransaction = timeoutEvent.getServerTransaction();
-//        if (serverTransaction != null) {
-//            Request request = serverTransaction.getRequest();
-//            URI requestURI = request.getRequestURI();
-//            Header header = request.getHeader(FromHeader.NAME);
-//        }
-//        if(timeoutProcessor != null) {
-//            timeoutProcessor.process(timeoutEvent);
-//        }
+        eventPublisher.requestTimeOut(timeoutEvent);
     }
 
     @Override

--
Gitblit v1.8.0