Merge remote-tracking branch 'upstream/master'

Lawrence

2021-01-12 d563527289927f2ac2f2f9ae25e0b59c5d532684

 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);