[enocean] Fix concurrency exception on startup (openhab#11408)

* made listeners a ConcurrentHashMap * synchronized access to listeners and eventListeners collections of EnOceanTransceiver * reverted ConcurrentHashMap change as NULL-Key is required Fixes openhab#11393 Also-by: Daniel Weber <[email protected]> Signed-off-by: Thomas Lauterbach <[email protected]>
nemerdaud · Jan 28, 2022 · d889d6b · d889d6b
1 parent feaa358
commit d889d6b
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/...an/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java b/...an/src/main/java/org/openhab/binding/enocean/internal/transceiver/EnOceanTransceiver.java
@@ -220,6 +220,7 @@ public void ShutDown() {
         readingTask = null;
         timeOut = null;
         listeners.clear();
+        eventListeners.clear();
         teachInListener = null;
         errorListener = null;
 
@@ -302,9 +303,11 @@ protected void informListeners(BasePacket packet) {
                         }
 
                         long s = Long.parseLong(HexUtils.bytesToHex(senderId), 16);
-                        HashSet<PacketListener> pl = listeners.get(s);
-                        if (pl != null) {
-                            pl.forEach(l -> l.packetReceived(msg));
+                        synchronized (this) {
+                            HashSet<PacketListener> pl = listeners.get(s);
+                            if (pl != null) {
+                                pl.forEach(l -> l.packetReceived(msg));
+                            }
                         }
                     }
                 } else {
@@ -331,7 +334,9 @@ protected void informListeners(BasePacket packet) {
                     }
                 }
 
-                eventListeners.forEach(l -> l.eventReceived(event));
+                synchronized (this) {
+                    eventListeners.forEach(l -> l.eventReceived(event));
+                }
             }
         } catch (Exception e) {
             logger.error("Exception in informListeners", e);
@@ -374,13 +379,13 @@ public void sendBasePacket(BasePacket packet, ResponseListener<? extends Respons
 
     protected abstract byte[] serializePacket(BasePacket packet) throws EnOceanException;
 
-    public void addPacketListener(PacketListener listener, long senderIdToListenTo) {
+    public synchronized void addPacketListener(PacketListener listener, long senderIdToListenTo) {
         if (listeners.computeIfAbsent(senderIdToListenTo, k -> new HashSet<>()).add(listener)) {
             logger.debug("Listener added: {}", senderIdToListenTo);
         }
     }
 
-    public void removePacketListener(PacketListener listener, long senderIdToListenTo) {
+    public synchronized void removePacketListener(PacketListener listener, long senderIdToListenTo) {
         HashSet<PacketListener> pl = listeners.get(senderIdToListenTo);
         if (pl != null) {
             pl.remove(listener);
@@ -390,11 +395,11 @@ public void removePacketListener(PacketListener listener, long senderIdToListenT
         }
     }
 
-    public void addEventMessageListener(EventListener listener) {
+    public synchronized void addEventMessageListener(EventListener listener) {
         eventListeners.add(listener);
     }
 
-    public void removeEventMessageListener(EventListener listener) {
+    public synchronized void removeEventMessageListener(EventListener listener) {
         eventListeners.remove(listener);
     }