X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fimpl%2FAbstractForwardedDataBroker.java;h=4bbeaebf55b34888d37e74ec0aa2a468dd59b3b4;hb=ed8f40c01c61ed505cb0c4d5b307a8dea0acc82f;hp=b37bb045b118c58ccae9b8c3c6e09fa297a69741;hpb=0dcdc14a4ff38b39fed0d07658941a09a4c043fd;p=controller.git

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java
index b37bb045b1..4bbeaebf55 100644
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.controller.md.sal.binding.impl;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
 import java.util.Collections;
 import java.util.HashMap;
@@ -65,7 +65,7 @@ public abstract class AbstractForwardedDataBroker implements Delegator<DOMDataBr
             final InstanceIdentifier<?> path, final DataChangeListener listener, final DataChangeScope triggeringScope) {
         final DOMDataChangeListener domDataChangeListener = new TranslatingDataChangeInvoker(store, path, listener,
                 triggeringScope);
-        final YangInstanceIdentifier domPath = codec.toNormalized(path);
+        final YangInstanceIdentifier domPath = codec.toYangInstanceIdentifierBlocking(path);
         final ListenerRegistration<DOMDataChangeListener> domRegistration = domDataBroker.registerDataChangeListener(store,
                 domPath, domDataChangeListener, triggeringScope);
         return new ListenerRegistrationImpl(listener, domRegistration);
@@ -218,7 +218,7 @@ public abstract class AbstractForwardedDataBroker implements Delegator<DOMDataBr
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(TranslatedDataChangeEvent.class) //
+            return MoreObjects.toStringHelper(TranslatedDataChangeEvent.class) //
                     .add("created", getCreatedData()) //
                     .add("updated", getUpdatedData()) //
                     .add("removed", getRemovedPaths()) //