X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FShardTransactionChain.java;h=50042411b17eeb0b0428963535008e8a777ca915;hp=2991a7742abd986cdfcce96bd378aa00bdd110c9;hb=516a4b2ea78179c9bd6ebb584862e8fc686ebf08;hpb=de3e413b633b7555ae8f3fe2ec163dbb7dda5da8 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 2991a7742a..50042411b1 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,7 +14,7 @@ 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.protobuff.messages.transaction.ShardTransactionMessages; +import org.opendaylight.controller.cluster.datastore.messages.CreateTransactionReply; 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; @@ -34,12 +34,14 @@ public class ShardTransactionChain extends AbstractUntypedActor { @Override public void handleReceive(Object message) throws Exception { - if (message instanceof CreateTransaction) { - CreateTransaction createTransaction = (CreateTransaction) message; + if (message.getClass().equals(CreateTransaction.SERIALIZABLE_CLASS)) { + CreateTransaction createTransaction = CreateTransaction.fromSerializable( message); createTransaction(createTransaction); - } else if (message instanceof CloseTransactionChain) { + } else if (message.getClass().equals(CloseTransactionChain.SERIALIZABLE_CLASS)) { chain.close(); - getSender().tell(new CloseTransactionChainReply(), getSelf()); + getSender().tell(new CloseTransactionChainReply().toSerializable(), getSelf()); + }else{ + throw new Exception("Not recognized message recieved="+message); } } @@ -49,10 +51,7 @@ public class ShardTransactionChain extends AbstractUntypedActor { ActorRef transactionActor = getContext().actorOf(ShardTransaction .props(chain, transaction, getContext().parent(), schemaContext), "shard-" + createTransaction.getTransactionId()); getSender() - .tell(ShardTransactionMessages.CreateTransactionReply.newBuilder() - .setTransactionActorPath(transactionActor.path().toString()) - .setTransactionId(createTransaction.getTransactionId()) - .build(), + .tell(new CreateTransactionReply(transactionActor.path().toString(),createTransaction.getTransactionId()).toSerializable(), getSelf()); }