From bfee2501cc5cd176542c16fffe5546a9e36a3062 Mon Sep 17 00:00:00 2001
From: Tony Tkacik <ttkacik@cisco.com>
Date: Tue, 11 Feb 2014 19:35:42 +0100
Subject: [PATCH] Fixed bug when publisher's thread was blocked until all
 notifications were delivered.

Change-Id: Ieb083feec0ac6a64877fb045fa4fa6ba6e3fa412
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
---
 .../binding/impl/NotificationBrokerImpl.xtend    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend
index d997af5912..a7dcf80e8d 100644
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend
@@ -23,8 +23,10 @@ import org.opendaylight.yangtools.yang.binding.Notification
 import org.slf4j.LoggerFactory
 import org.opendaylight.controller.sal.binding.codegen.impl.SingletonHolder
import com.google.common.collect.Multimaps
 import org.opendaylight.yangtools.concepts.util.ListenerRegistry
-import org.opendaylight.controller.sal.binding.api.NotificationProviderService.NotificationInterestListener
-
+import org.opendaylight.controller.sal.binding.api.NotificationProviderService.NotificationInterestListener
import java.util.Set
+import com.google.common.collect.ImmutableSet
+import java.util.concurrent.Future
+
 class NotificationBrokerImpl implements NotificationProviderService, AutoCloseable {
     
     val ListenerRegistry<NotificationInterestListener> interestListeners = ListenerRegistry.create;
@@ -100,7 +102,15 @@ class NotificationBrokerImpl implements NotificationProviderService, AutoCloseab
             listenerToNotify = listenerToNotify + listeners.get(type as Class<? extends Notification>)
         }
         val tasks = listenerToNotify.map[new NotifyTask(it, notification)].toSet;
-        executor.invokeAll(tasks);
+        submitAll(executor,tasks);
+    }
+    
+    def submitAll(ExecutorService service, Set<NotifyTask> tasks) {
+        val ret = ImmutableSet.<Future<Object>>builder();
+        for(task : tasks) {
+            ret.add(service.submit(task));
+        }
+        return ret.build();
     }
 
     override <T extends Notification> registerNotificationListener(Class<T> notificationType,
-- 
2.36.6