Fix SnapshotBackedWriteTransaction error message

[mdsal.git] / dom / mdsal-dom-spi / src / main / java / org / opendaylight / mdsal / dom / spi / ForwardingDOMDataBroker.java

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBroker.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBroker.java
index 5575cb15abbd8ccc07d9aa81fbbe620ae2bb67a2..cb4e8aedddf149582525010f03708255feb06ec0 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBroker.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMDataBroker.java
@@ -9,14 +9,14 @@ package org.opendaylight.mdsal.dom.spi;
 
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ForwardingObject;
-import javax.annotation.Nonnull;
-import org.opendaylight.mdsal.common.api.TransactionChainListener;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataBrokerExtension;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
+import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener;
 
 /**
  * Utility {@link DOMDataBroker} implementation which forwards all interface
@@ -25,8 +25,7 @@ import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
 public abstract class ForwardingDOMDataBroker extends ForwardingObject implements DOMDataBroker {
 
     @Override
-    @Nonnull
-    protected abstract DOMDataBroker delegate();
+    protected abstract @NonNull DOMDataBroker delegate();
 
     @Override
     public DOMDataTreeReadTransaction newReadOnlyTransaction() {
@@ -44,10 +43,15 @@ public abstract class ForwardingDOMDataBroker extends ForwardingObject implement
     }
 
     @Override
-    public DOMTransactionChain createTransactionChain(final TransactionChainListener listener) {
+    public DOMTransactionChain createTransactionChain(final DOMTransactionChainListener listener) {
         return delegate().createTransactionChain(listener);
     }
 
+    @Override
+    public DOMTransactionChain createMergingTransactionChain(final DOMTransactionChainListener listener) {
+        return delegate().createMergingTransactionChain(listener);
+    }
+
     @Override
     public ClassToInstanceMap<DOMDataBrokerExtension> getExtensions() {
         return delegate().getExtensions();