From 5e272330c2570eaf485bc65157f17267abeada11 Mon Sep 17 00:00:00 2001
From: dengming <dengming@ctfo.com>
Date: 星期四, 10 三月 2022 17:52:59 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of github.com:AbnerSC/wvp-GB28181-pro into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
index 853ec56..955b68b 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
@@ -150,7 +150,7 @@
JSONObject result = new JSONObject();
result.put("error", "channel[ " + code + " ] " + eventResult.msg);
resultDeferredResult.setResult(result);
- });
+ }, null);
return resultDeferredResult;
}
--
Gitblit v1.8.0