From d563527289927f2ac2f2f9ae25e0b59c5d532684 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期二, 12 一月 2021 13:03:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
index 0c1e63d..5fd8cbc 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
@@ -2,6 +2,7 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -24,7 +25,9 @@
public static final String CALLBACK_CMD_PlAY = "CALLBACK_PLAY";
- private Map<String, DeferredResult> map = new HashMap<String, DeferredResult>();
+ public static final String CALLBACK_CMD_STOP = "CALLBACK_STOP";
+
+ private Map<String, DeferredResult> map = new ConcurrentHashMap<String, DeferredResult>();
public void put(String key, DeferredResult result) {
map.put(key, result);
--
Gitblit v1.8.0