Move InitialClientActorContext allocation

The context is inherently tied to RecoveringClientActorBehaviour,
allocate it there.

Change-Id: I37a0c9d8ee2a187256b200035b320bd2f6b86c0b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActor.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActor.java
index 98edb1d3419dbde6e97352c964f143f10558bfcb..bed5ffc35c3034193195c90cf2831d8947429748 100644 (file)
--- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActor.java
+++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/AbstractClientActor.java
@@ -19,11 +19,11 @@ import org.slf4j.LoggerFactory;
  */
 public abstract class AbstractClientActor extends AbstractPersistentActor {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractClientActor.class);
+
     private AbstractClientActorBehavior<?> currentBehavior;
 
     protected AbstractClientActor(final FrontendIdentifier frontendId) {
-        currentBehavior = new RecoveringClientActorBehavior(
-                new InitialClientActorContext(this, frontendId.toPersistentId()), frontendId);
+        currentBehavior = new RecoveringClientActorBehavior(this, frontendId);
     }
 
     @Override

diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/RecoveringClientActorBehavior.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/RecoveringClientActorBehavior.java
index b44d54921d9de38b898a06633f6c5dec25b2c36e..e97df6af2e91aafba9c26150caa96bc7d976c13a 100644 (file)
--- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/RecoveringClientActorBehavior.java
+++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/RecoveringClientActorBehavior.java
@@ -34,8 +34,8 @@ final class RecoveringClientActorBehavior extends AbstractClientActorBehavior<In
     private final FrontendIdentifier currentFrontend;
     private ClientIdentifier lastId = null;
 
-    RecoveringClientActorBehavior(final InitialClientActorContext context, final FrontendIdentifier frontendId) {
-        super(context);
+    RecoveringClientActorBehavior(final AbstractClientActor actor, final FrontendIdentifier frontendId) {
+        super(new InitialClientActorContext(actor, frontendId.toPersistentId()));
         currentFrontend = requireNonNull(frontendId);
     }