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%2FTransactionChainProxy.java;h=b467ee4ddbf56c456c2e9f0f62381eefa173e31d;hb=a888890a7dc49005eb5461c9cefe3dd5eccbe6a0;hp=b74c89d727c2a1761a7c993272abcab1e4ad9999;hpb=05193e1f77cb4f1be9a58b946cd11e619c10bb8c;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java index b74c89d727..b467ee4ddb 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java @@ -8,7 +8,7 @@ package org.opendaylight.controller.cluster.datastore; -import akka.actor.ActorPath; +import akka.actor.ActorSelection; import akka.dispatch.Futures; import org.opendaylight.controller.cluster.datastore.messages.CloseTransactionChain; import org.opendaylight.controller.cluster.datastore.utils.ActorContext; @@ -28,7 +28,7 @@ import java.util.List; public class TransactionChainProxy implements DOMStoreTransactionChain{ private final ActorContext actorContext; private final String transactionChainId; - private volatile List> cohortPathFutures = Collections.emptyList(); + private volatile List> cohortFutures = Collections.emptyList(); public TransactionChainProxy(ActorContext actorContext) { this.actorContext = actorContext; @@ -63,14 +63,14 @@ public class TransactionChainProxy implements DOMStoreTransactionChain{ return transactionChainId; } - public void onTransactionReady(List> cohortPathFutures){ - this.cohortPathFutures = cohortPathFutures; + public void onTransactionReady(List> cohortFutures){ + this.cohortFutures = cohortFutures; } public void waitTillCurrentTransactionReady(){ try { Await.result(Futures - .sequence(this.cohortPathFutures, actorContext.getActorSystem().dispatcher()), + .sequence(this.cohortFutures, actorContext.getActorSystem().dispatcher()), actorContext.getOperationDuration()); } catch (Exception e) { throw new IllegalStateException("Failed when waiting for transaction on a chain to become ready", e);