Support multithreading DataBrokerTestCustomizer (AbstractDataBrokerTest)

https://bugs.opendaylight.org/show_bug.cgi?id=7538 has full background

Bug: 7538
Change-Id: Ic3f2169e18928e3010e45bddb43186cc53d897f4
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestCustomizer.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestCustomizer.java
index 23600a3710cc7207c9d20c095e13a067b27c265a..8d34cbd2cd6f7b5df33b2008e9bb806e0780f9fb 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestCustomizer.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestCustomizer.java
@@ -10,6 +10,7 @@ package org.opendaylight.controller.md.sal.binding.test;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;

+import java.util.concurrent.Executors;

 import javassist.ClassPool;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import javassist.ClassPool;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;


@@ -83,9 +84,8 @@ public class DataBrokerTestCustomizer {
         return new BindingDOMNotificationPublishServiceAdapter(bindingToNormalized, domNotificationRouter);
     }
 
         return new BindingDOMNotificationPublishServiceAdapter(bindingToNormalized, domNotificationRouter);
     }
 

-

     public ListeningExecutorService getCommitCoordinatorExecutor() {
     public ListeningExecutorService getCommitCoordinatorExecutor() {

-        return MoreExecutors.newDirectExecutorService();
+        return MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor());

     }
 
     public DataBroker createDataBroker() {
     }
 
     public DataBroker createDataBroker() {


@@ -101,7 +101,7 @@ public class DataBrokerTestCustomizer {
     }
 
     private DOMDataBroker getDOMDataBroker() {
     }
 
     private DOMDataBroker getDOMDataBroker() {

-        if(domDataBroker == null) {
+        if (domDataBroker == null) {

             domDataBroker = createDOMDataBroker();
         }
         return domDataBroker;
             domDataBroker = createDOMDataBroker();
         }
         return domDataBroker;