From 662ce3b484c3726369e4cf6b70fc875e57d2f66e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 15 四月 2021 11:52:14 +0800
Subject: [PATCH] Merge pull request #84 from lawrencehj/wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
index ddf8183..e31f0e8 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
@@ -118,12 +118,11 @@
     public boolean stop(String app, String stream) {
         boolean result = false;
         StreamProxyItem streamProxyDto = videoManagerStorager.queryStreamProxy(app, stream);
-        if (streamProxyDto.isEnable() &&  streamProxyDto != null) {
+        if (streamProxyDto != null && streamProxyDto.isEnable()) {
             JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyDto);
             if (jsonObject.getInteger("code") == 0) {
-                result = true;
                 streamProxyDto.setEnable(false);
-                videoManagerStorager.updateStreamProxy(streamProxyDto);
+                result = videoManagerStorager.updateStreamProxy(streamProxyDto);
             }
         }
         return result;

--
Gitblit v1.8.0