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%2FShardTransactionChain.java;h=2991a7742abd986cdfcce96bd378aa00bdd110c9;hb=fe4049d34de103016d11f3a9050853c6380646d3;hp=1092e9a793d82443b2bda82eeb81fbebb7360675;hpb=492324f1b08f853084217c3fa8b628f551bb81ad;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionChain.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionChain.java index 1092e9a793..2991a7742a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionChain.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransactionChain.java @@ -14,9 +14,10 @@ import akka.japi.Creator; import org.opendaylight.controller.cluster.datastore.messages.CloseTransactionChain; import org.opendaylight.controller.cluster.datastore.messages.CloseTransactionChainReply; import org.opendaylight.controller.cluster.datastore.messages.CreateTransaction; -import org.opendaylight.controller.cluster.datastore.messages.CreateTransactionReply; +import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages; import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction; import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransactionChain; +import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** * The ShardTransactionChain Actor represents a remote TransactionChain @@ -24,9 +25,11 @@ import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransactionChain; public class ShardTransactionChain extends AbstractUntypedActor { private final DOMStoreTransactionChain chain; + private final SchemaContext schemaContext; - public ShardTransactionChain(DOMStoreTransactionChain chain) { + public ShardTransactionChain(DOMStoreTransactionChain chain, SchemaContext schemaContext) { this.chain = chain; + this.schemaContext = schemaContext; } @Override @@ -44,18 +47,21 @@ public class ShardTransactionChain extends AbstractUntypedActor { DOMStoreReadWriteTransaction transaction = chain.newReadWriteTransaction(); ActorRef transactionActor = getContext().actorOf(ShardTransaction - .props(chain, transaction, getContext().parent()), "shard-" + createTransaction.getTransactionId()); + .props(chain, transaction, getContext().parent(), schemaContext), "shard-" + createTransaction.getTransactionId()); getSender() - .tell(new CreateTransactionReply(transactionActor.path(), createTransaction.getTransactionId()), + .tell(ShardTransactionMessages.CreateTransactionReply.newBuilder() + .setTransactionActorPath(transactionActor.path().toString()) + .setTransactionId(createTransaction.getTransactionId()) + .build(), getSelf()); } - public static Props props(final DOMStoreTransactionChain chain) { + public static Props props(final DOMStoreTransactionChain chain, final SchemaContext schemaContext) { return Props.create(new Creator() { @Override public ShardTransactionChain create() throws Exception { - return new ShardTransactionChain(chain); + return new ShardTransactionChain(chain, schemaContext); } }); }