Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.6.9' into wvp-28181-2.0

pull/1270/head
648540858 2024-01-10 16:17:53 +08:00
parent 0c10c77a56 c25a99d60b
commit 64be28ed77
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
View File

@ -734,11 +734,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
redisPushStreamResponseListener.removeEvent(gbStream.getApp(), gbStream.getStream()); redisPushStreamResponseListener.removeEvent(gbStream.getApp(), gbStream.getStream());
mediaListManager.removedChannelOnlineEventLister(gbStream.getApp(), gbStream.getStream()); mediaListManager.removedChannelOnlineEventLister(gbStream.getApp(), gbStream.getStream());
responseAck(request, Response.REQUEST_TIMEOUT); // 超时 responseAck(request, Response.REQUEST_TIMEOUT); // 超时
} catch (SipException e) { } catch (SipException | InvalidArgumentException | ParseException e) {
logger.error("未处理的异常 ", e);
} catch (InvalidArgumentException e) {
logger.error("未处理的异常 ", e);
} catch (ParseException e) {
logger.error("未处理的异常 ", e); logger.error("未处理的异常 ", e);
} }
}, userSetting.getPlatformPlayTimeout()); }, userSetting.getPlatformPlayTimeout());

2
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
View File

@ -149,7 +149,7 @@ public class PlatformServiceImpl implements IPlatformService {
dynamicTask.stop(registerTaskKey); dynamicTask.stop(registerTaskKey);
// 注销旧的 // 注销旧的
try { try {
if (parentPlatformOld.isStatus()) { if (parentPlatformOld.isStatus() && parentPlatformCatchOld != null) {
logger.info("保存平台{}时发现旧平台在线，发送注销命令", parentPlatformOld.getServerGBId()); logger.info("保存平台{}时发现旧平台在线，发送注销命令", parentPlatformOld.getServerGBId());
commanderForPlatform.unregister(parentPlatformOld, parentPlatformCatchOld.getSipTransactionInfo(), null, eventResult -> { commanderForPlatform.unregister(parentPlatformOld, parentPlatformCatchOld.getSipTransactionInfo(), null, eventResult -> {
logger.info("[国标级联] 注销成功， 平台：{}", parentPlatformOld.getServerGBId()); logger.info("[国标级联] 注销成功， 平台：{}", parentPlatformOld.getServerGBId());