aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-18 19:37:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1647 from kairlec/master

Browse Source 
修复当注销流时没有与之关联的国标通道时会出现的NPE
This commit is contained in:
648540858 2024-10-15 15:01:24 +08:00 committed by GitHub
commit 0127d712a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
View File

@ -284,7 +284,10 @@ public class StreamPushServiceImpl implements IStreamPushService {
}
streamPush.setPushing(false);
if (userSetting.isUsePushingAsStatus()) {
gbChannelService.offline(streamPush.buildCommonGBChannel());
CommonGBChannel commonGBChannel = streamPush.buildCommonGBChannel();
if (commonGBChannel != null) {
gbChannelService.offline(commonGBChannel);
}
}
sendRtpServerService.deleteByStream(streamPush.getStream());
mediaServerService.stopSendRtp(mediaServer, streamPush.getApp(), streamPush.getStream(), null);