Fix ConcurrentModificationEx in RpcRegistry.onBucketsUpdated

[controller.git] / opendaylight / md-sal / sal-remoterpc-connector / src / main / java / org / opendaylight / controller / remote / rpc / registry / RpcRegistry.java

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java
index b467ce949ae4a86e9500fffa9f05b85c0ba407e1..1e481bc311b3f30d2bfc75346077253a871bdff0 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java
@@ -187,7 +187,11 @@ public class RpcRegistry extends BucketStore<RoutingTable> {
 
     @Override
     protected void onBucketsUpdated() {
-        for(Runnable callBack: routesUpdatedCallbacks) {
+        if(routesUpdatedCallbacks.isEmpty()) {
+            return;
+        }
+
+        for(Runnable callBack: routesUpdatedCallbacks.toArray(new Runnable[routesUpdatedCallbacks.size()])) {
             callBack.run();
         }
     }