X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatabroker%2FConcurrentDOMDataBroker.java;h=bdaa6db6c1a1f1d3fc08b10c25f8f83ee27b5a60;hp=02362b9371bb76c54d2168baf56109cf4ab6e1d6;hb=281fa4f5d175c989619098ed4099085ae3aa4da7;hpb=1d3c54640b9fff649fe8d0f57e20d56f8f936cc1 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java index 02362b9371..bdaa6db6c1 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java @@ -263,7 +263,7 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat /** * ThreadLocal used to detect if the task completion thread is running the future listener Runnables. */ - private static final ThreadLocal ON_TASK_COMPLETION_THREAD_TL = new ThreadLocal(); + private static final ThreadLocal ON_TASK_COMPLETION_THREAD_TL = new ThreadLocal<>(); private final Executor listenerExecutor; @@ -340,7 +340,7 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat throw new UnsupportedOperationException("Commit cohort is not supported for " + path); } - private LogicalDatastoreType toLegacy(org.opendaylight.mdsal.common.api.LogicalDatastoreType datastoreType) { + private static LogicalDatastoreType toLegacy(org.opendaylight.mdsal.common.api.LogicalDatastoreType datastoreType) { switch (datastoreType) { case CONFIGURATION: return LogicalDatastoreType.CONFIGURATION; @@ -350,4 +350,9 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat throw new IllegalArgumentException("Unsupported data store type: " + datastoreType); } } + + @Override + public String toString() { + return "Clustered ConcurrentDOMDataBroker"; + } }