From d5739409e551edb65e1de336a48d5a981142b20f Mon Sep 17 00:00:00 2001
From: chenparty <870300816@qq.com>
Date: 星期三, 17 十一月 2021 15:30:38 +0800
Subject: [PATCH] fix bug
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java | 2 +-
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
index 54b4955..20aa957 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
@@ -108,10 +108,10 @@
msg.setData("Timeout. Device did not response to this command.");
resultHolder.invokeAllResult(msg);
});
- resultHolder.put(key, uuid, result);
if (resultHolder.exist(key, null)){
return result;
}
+ resultHolder.put(key, uuid, result);
cmder.recordCmd(device, channelId, recordCmdStr, event -> {
RequestMessage msg = new RequestMessage();
msg.setId(uuid);
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
index 314bbae..f6228af 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
@@ -88,10 +88,10 @@
msg.setData("Timeout");
resultHolder.invokeAllResult(msg);
});
- resultHolder.put(key, uuid, result);
if(resultHolder.exist(key, null)) {
return result;
}
+ resultHolder.put(key, uuid, result);
Device device = storager.queryVideoDevice(deviceId);
StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId);
if (streamInfo != null) {
--
Gitblit v1.8.0