Bug 7746: Fix intermittent EOS test failure and synchronization

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / entityownership / EntityOwnerChangeListener.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java
index 050ee5d4a57214092abbf07cb736610b91b0e64c..cc45bc0a82902481c092aed6c7651e0c99d034d8 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java
@@ -32,11 +32,11 @@ class EntityOwnerChangeListener extends AbstractEntityOwnerChangeListener {
     private static final Logger LOG = LoggerFactory.getLogger(EntityOwnerChangeListener.class);
 
     private final String localMemberName;
-    private final EntityOwnershipListenerSupport listenerSupport;
+    private final EntityOwnershipChangePublisher publisher;
 
-    EntityOwnerChangeListener(final MemberName localMemberName, final EntityOwnershipListenerSupport listenerSupport) {
+    EntityOwnerChangeListener(final MemberName localMemberName, final EntityOwnershipChangePublisher publisher) {
         this.localMemberName = Verify.verifyNotNull(localMemberName.getName());
-        this.listenerSupport = Preconditions.checkNotNull(listenerSupport);
+        this.publisher = Preconditions.checkNotNull(publisher);
     }
 
     @Override
@@ -67,12 +67,12 @@ class EntityOwnerChangeListener extends AbstractEntityOwnerChangeListener {
                 LOG.debug("{}: Calling notifyEntityOwnershipListeners: entity: {}, wasOwner: {}, isOwner: {}, hasOwner: {}",
                         logId(), entity, wasOwner, isOwner, hasOwner);
 
-                listenerSupport.notifyEntityOwnershipListeners(entity, wasOwner, isOwner, hasOwner);
+                publisher.notifyEntityOwnershipListeners(entity, wasOwner, isOwner, hasOwner);
             }
         }
     }
 
     private String logId() {
-        return listenerSupport.getLogId();
+        return publisher.getLogId();
     }
 }