Commit d5739409e551edb65e1de336a48d5a981142b20f
1 parent
9561e952
fix bug
Showing
2 changed files
with
2 additions
and
2 deletions
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
| ... | ... | @@ -108,10 +108,10 @@ public class DeviceControl { |
| 108 | 108 | msg.setData("Timeout. Device did not response to this command."); |
| 109 | 109 | resultHolder.invokeAllResult(msg); |
| 110 | 110 | }); |
| 111 | - resultHolder.put(key, uuid, result); | |
| 112 | 111 | if (resultHolder.exist(key, null)){ |
| 113 | 112 | return result; |
| 114 | 113 | } |
| 114 | + resultHolder.put(key, uuid, result); | |
| 115 | 115 | cmder.recordCmd(device, channelId, recordCmdStr, event -> { |
| 116 | 116 | RequestMessage msg = new RequestMessage(); |
| 117 | 117 | msg.setId(uuid); | ... | ... |
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/DownloadController.java
| ... | ... | @@ -88,10 +88,10 @@ public class DownloadController { |
| 88 | 88 | msg.setData("Timeout"); |
| 89 | 89 | resultHolder.invokeAllResult(msg); |
| 90 | 90 | }); |
| 91 | - resultHolder.put(key, uuid, result); | |
| 92 | 91 | if(resultHolder.exist(key, null)) { |
| 93 | 92 | return result; |
| 94 | 93 | } |
| 94 | + resultHolder.put(key, uuid, result); | |
| 95 | 95 | Device device = storager.queryVideoDevice(deviceId); |
| 96 | 96 | StreamInfo streamInfo = redisCatchStorage.queryPlaybackByDevice(deviceId, channelId); |
| 97 | 97 | if (streamInfo != null) { | ... | ... |