From bea63f67e75ea6c38d946c2ee463260fcf815f87 Mon Sep 17 00:00:00 2001
From: Fang <costa11@qq.com>
Date: 星期一, 07 三月 2022 14:21:29 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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 c8cca53..84b36e3 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
@@ -77,21 +77,23 @@
if (eventMap == null) {
return;
}
- 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) {
- result = key.getString(s).equals(hookResponse.getString(s));
- }else {
- if (key.getString(s) == null) continue;
- result = result && key.getString(s).equals(hookResponse.getString(s));
+
+ Set<Map.Entry<JSONObject, Event>> entries = eventMap.entrySet();
+ if (entries.size() > 0) {
+ for (Map.Entry<JSONObject, Event> entry : entries) {
+ JSONObject key = entry.getKey();
+ Boolean result = null;
+ for (String s : key.keySet()) {
+ if (result == null) {
+ result = key.getString(s).equals(hookResponse.getString(s));
+ }else {
+ if (key.getString(s) == null) continue;
+ result = result && key.getString(s).equals(hookResponse.getString(s));
+ }
}
- }
- if (null != result && result){
- iterator.remove();
+ if (null != result && result){
+ entries.remove(entry);
+ }
}
}
}
--
Gitblit v1.8.0