X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FDelayedListenerRegistration.java;h=ac132721c5dcc9954a152f0fcc5d1a94787e0fe5;hb=8f2b69d0944fe8ebc7e4300bb7a05265c7c290d7;hp=8f18cb74dc79c6cd7cb6c08b03640b9df173dcd8;hpb=6050fd28f2def659abb5bc9d7127eb748b5fb32a;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedListenerRegistration.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedListenerRegistration.java
index 8f18cb74dc..ac132721c5 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedListenerRegistration.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedListenerRegistration.java
@@ -7,25 +7,22 @@
  */
 package org.opendaylight.controller.cluster.datastore;
 
-import com.google.common.base.Optional;
 import java.util.EventListener;
-import java.util.Map.Entry;
 import javax.annotation.concurrent.GuardedBy;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
 
-abstract class DelayedListenerRegistration<L extends EventListener, R> implements ListenerRegistration<L> {
-    private final R registrationMessage;
+abstract class DelayedListenerRegistration<L extends EventListener, M> implements ListenerRegistration<L> {
+    private final M registrationMessage;
     private volatile ListenerRegistration<L> delegate;
 
     @GuardedBy("this")
     private boolean closed;
 
-    protected DelayedListenerRegistration(R registrationMessage) {
+    protected DelayedListenerRegistration(M registrationMessage) {
         this.registrationMessage = registrationMessage;
     }
 
-    R getRegistrationMessage() {
+    M getRegistrationMessage() {
         return registrationMessage;
     }
 
@@ -33,11 +30,10 @@ abstract class DelayedListenerRegistration<L extends EventListener, R> implement
         return delegate;
     }
 
-    synchronized <LR extends ListenerRegistration<L>> void createDelegate(
-            final LeaderLocalDelegateFactory<R, LR, Optional<DataTreeCandidate>> factory) {
+    synchronized <R extends ListenerRegistration<L>> void createDelegate(
+            final LeaderLocalDelegateFactory<M, R> factory) {
         if (!closed) {
-            final Entry<LR, Optional<DataTreeCandidate>> res = factory.createDelegate(registrationMessage);
-            this.delegate = res.getKey();
+            this.delegate = factory.createDelegate(registrationMessage);
         }
     }