From: Michael Vorburger <vorburger@redhat.com>
Date: Mon, 6 Feb 2017 12:47:24 +0000 (+0100)
Subject: Revert "Support multithreading DataBrokerTestCustomizer (AbstractDataBrokerTest)"
X-Git-Tag: release/carbon~288
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=a7f36d5bcbf1897672422910a890c4aabb6dd34e

Revert "Support multithreading DataBrokerTestCustomizer (AbstractDataBrokerTest)"

This reverts commit 930817d4f1e01c7e08fd7e8ad79bf781cb53034a of Bug 7538.

Bug:7538
Change-Id: Ie26f217a2f64cb4eea2d64f2280f6d9773713b21
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 8d34cbd2cd..23600a3710 100644
--- 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,7 +10,6 @@ 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 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;
@@ -84,8 +83,9 @@ public class DataBrokerTestCustomizer {
         return new BindingDOMNotificationPublishServiceAdapter(bindingToNormalized, domNotificationRouter);
     }
 
+
     public ListeningExecutorService getCommitCoordinatorExecutor() {
-        return MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor());
+        return MoreExecutors.newDirectExecutorService();
     }
 
     public DataBroker createDataBroker() {
@@ -101,7 +101,7 @@ public class DataBrokerTestCustomizer {
     }
 
     private DOMDataBroker getDOMDataBroker() {
-        if (domDataBroker == null) {
+        if(domDataBroker == null) {
             domDataBroker = createDOMDataBroker();
         }
         return domDataBroker;