From fd296d1a6acccbe9f3a72623719bf7101725f4e9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 06 五月 2021 09:28:22 +0800
Subject: [PATCH] Merge pull request #93 from yu1183688986/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
index bf54f50..a69cec8 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
@@ -63,7 +63,7 @@
}
}
- if (result) {
+ if (null != result && result) {
event = eventMap.get(key);
}
}
@@ -75,7 +75,10 @@
if (eventMap == null) {
return;
}
- for (JSONObject key : eventMap.keySet()) {
+ Iterator<Map.Entry<JSONObject, Event>> iterator = eventMap.entrySet().iterator();
+ while (iterator.hasNext()){
+ Map.Entry<JSONObject, Event> next = iterator.next();
+ JSONObject key = next.getKey();
Boolean result = null;
for (String s : key.keySet()) {
if (result == null) {
@@ -85,8 +88,8 @@
}
}
- if (result) {
- eventMap.remove(key);
+ if (null != result && result){
+ iterator.remove();
}
}
}
--
Gitblit v1.8.0