From b2fa4608a2e0abb3d744f4f91bd423380e45f9c4 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期三, 16 十二月 2020 12:43:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'

---
 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java
index f44e7df..8195b65 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java
@@ -29,7 +29,7 @@
         param.put("enable_tcp", 1);
         param.put("stream_id", streamId);
         JSONObject jsonObject = zlmresTfulUtils.openRtpServer(param);
-        if (jsonObject.getInteger("code") == 0) {
+        if (jsonObject != null && jsonObject.getInteger("code") == 0) {
             return newPort;
         } else {
             return getNewRTPPort(ssrc);

--
Gitblit v1.8.0