Fixes issue #24849 make relevant methods synchronized in

LocalTxConnectionEventListener and protect associatedHandles from external clear calls. Process review comment: use getOrDefault.
eclipse-ee4j · Mar 12, 2024 · 71d422e · 71d422e
1 parent db6268a
commit 71d422e
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/...me/src/main/java/com/sun/enterprise/resource/listener/LocalTxConnectionEventListener.java b/...me/src/main/java/com/sun/enterprise/resource/listener/LocalTxConnectionEventListener.java
@@ -61,10 +61,7 @@ public LocalTxConnectionEventListener(ResourceHandle resource) {
     @Override
     public synchronized void connectionClosed(ConnectionEvent evt) {
         Object connectionHandle = evt.getConnectionHandle();
-        ResourceHandle handle = resource;
-        if (associatedHandles.containsKey(connectionHandle)) {
-            handle = associatedHandles.get(connectionHandle);
-        }
+        ResourceHandle handle = associatedHandles.getOrDefault(connectionHandle, resource);
         // ManagedConnection instance is still valid and put back in the pool: do not remove the event listener.
         poolManager.resourceClosed(handle);
     }
@@ -88,10 +85,7 @@ public synchronized void connectionErrorOccurred(ConnectionEvent evt) {
     @Override
     public synchronized void badConnectionClosed(ConnectionEvent evt) {
         Object connectionHandle = evt.getConnectionHandle();
-        ResourceHandle handle = resource;
-        if (associatedHandles.containsKey(connectionHandle)) {
-            handle = associatedHandles.get(connectionHandle);
-        }
+        ResourceHandle handle = associatedHandles.getOrDefault(connectionHandle, resource);
 
         // TODO: Explain why event listener needs to be removed.
         // There is no documentation mentioning: ManagedConnection instance is now invalid and unusable.