瀏覽代碼

修复hook订阅移除失败的问题

648540858 2 年之前
父節點
當前提交
affbd89fdb
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java

+ 4 - 2
src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java

@@ -98,7 +98,10 @@ public class ZlmHttpHookSubscribe {
 
             if (!CollectionUtils.isEmpty(entriesToRemove)) {
                 for (Map.Entry<IHookSubscribe, ZlmHttpHookSubscribe.Event> entry : entriesToRemove) {
-                    entries.remove(entry);
+                    eventMap.remove(entry.getKey());
+                }
+                if (eventMap.size() == 0) {
+                    allSubscribes.remove(hookSubscribe.getHookType());
                 }
             }
 
@@ -137,7 +140,6 @@ public class ZlmHttpHookSubscribe {
 //    @Scheduled(cron="0 0/5 * * * ?")   //每5分钟执行一次
     @Scheduled(fixedRate = 2 * 1000)
     public void execute(){
-        System.out.println(allSubscribes.size());
         Instant instant = Instant.now().minusMillis(TimeUnit.MINUTES.toMillis(5));
         int total = 0;
         for (HookType hookType : allSubscribes.keySet()) {