[BZ1336088] Backport JGRP-1869 (and JGRP-1834) to 3.2

belaban · May 14, 2016 · a24bfeb · a24bfeb
1 parent 933fbdd
commit a24bfeb
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/src/org/jgroups/protocols/TP.java b/src/org/jgroups/protocols/TP.java
@@ -606,8 +606,11 @@ public void resetStats() {
     public void registerProbeHandler(DiagnosticsHandler.ProbeHandler handler) {
         if(diag_handler != null)
             diag_handler.registerProbeHandler(handler);
-        else
-            preregistered_probe_handlers.add(handler);
+        else {
+            synchronized(preregistered_probe_handlers) {
+                preregistered_probe_handlers.add(handler);
+            }
+        }
     }
 
     public void unregisterProbeHandler(DiagnosticsHandler.ProbeHandler handler) {
@@ -1059,8 +1062,12 @@ public String[] supportedKeys() {
             if(diag_handler_created)
                 diag_handler.start();
 
-            for(DiagnosticsHandler.ProbeHandler handler: preregistered_probe_handlers)
-                diag_handler.registerProbeHandler(handler);
+            synchronized(preregistered_probe_handlers) {
+                for(DiagnosticsHandler.ProbeHandler handler: preregistered_probe_handlers)
+                    diag_handler.registerProbeHandler(handler);
+            }
+        }
+        synchronized(preregistered_probe_handlers) {
             preregistered_probe_handlers.clear();
         }
 
@@ -1092,7 +1099,9 @@ public void stop() {
             diag_handler.stop();
             diag_handler=null;
         }
-        preregistered_probe_handlers.clear();
+        synchronized(preregistered_probe_handlers) {
+            preregistered_probe_handlers.clear();
+        }
         if(bundler != null)
             bundler.stop();
     }