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

修复空指针异常

pull/1694/head
648540858 2024-11-15 17:02:43 +08:00
parent 3c814f33a5
commit 0d32608fa9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
View File

@ -180,7 +180,7 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService {
if (mediaList.getInteger("code") == 0) { if (mediaList.getInteger("code") == 0) {
JSONArray data = mediaList.getJSONArray("data"); JSONArray data = mediaList.getJSONArray("data");
if (data == null) { if (data == null) {
return null; return streamInfoList;
} }
JSONObject mediaJSON = data.getJSONObject(0); JSONObject mediaJSON = data.getJSONObject(0);
MediaInfo mediaInfo = MediaInfo.getInstance(mediaJSON, mediaServer, userSetting.getServerId()); MediaInfo mediaInfo = MediaInfo.getInstance(mediaJSON, mediaServer, userSetting.getServerId());

2
src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPush.java
View File

@ -84,7 +84,7 @@ public class StreamPush extends CommonGBChannel implements Comparable<StreamPush
- DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(streamPushItem.getCreateTime())).intValue(); - DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(streamPushItem.getCreateTime())).intValue();
} }
public StreamPush getInstance(StreamInfo streamInfo) { public static StreamPush getInstance(StreamInfo streamInfo) {
StreamPush streamPush = new StreamPush(); StreamPush streamPush = new StreamPush();
streamPush.setApp(streamInfo.getApp()); streamPush.setApp(streamInfo.getApp());
if (streamInfo.getMediaServer() != null) { if (streamInfo.getMediaServer() != null) {

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

@ -535,7 +535,7 @@ public class StreamPushServiceImpl implements IStreamPushService {
String key = streamInfo.getApp() + "_" + streamInfo.getStream(); String key = streamInfo.getApp() + "_" + streamInfo.getStream();
StreamPush streamPushItem = result.get(key); StreamPush streamPushItem = result.get(key);
if (streamPushItem == null) { if (streamPushItem == null) {
streamPushItem = streamPushItem.getInstance(streamInfo); streamPushItem = StreamPush.getInstance(streamInfo);
result.put(key, streamPushItem); result.put(key, streamPushItem);
} }
} }