Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

panlinlin

2021-01-12 6e4a8cac04432f5a36d5c5e3c5eb3d28d2295a5c

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java

@@ -28,7 +28,7 @@
   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);

   }