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%2FShardReadWriteTransaction.java;h=49c7b7e78f52295e9b3b1fc5b1ae2ea10926def2;hb=d0bf270d0493c04ac2e9e4a9f7de56e5b65a4ef2;hp=6733bcfb9f6e323be99a849195bddac637f11588;hpb=9fb47da6a1e8bfb57cc56d4bf31d837b05ba72e6;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadWriteTransaction.java index 6733bcfb9f..49c7b7e78f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadWriteTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadWriteTransaction.java @@ -16,6 +16,7 @@ import akka.event.Logging; import akka.event.LoggingAdapter; import org.opendaylight.controller.cluster.datastore.messages.CloseTransaction; import org.opendaylight.controller.cluster.datastore.messages.CloseTransactionReply; +import org.opendaylight.controller.cluster.datastore.messages.DataExists; import org.opendaylight.controller.cluster.datastore.messages.DeleteData; import org.opendaylight.controller.cluster.datastore.messages.MergeData; import org.opendaylight.controller.cluster.datastore.messages.ReadData; @@ -52,9 +53,11 @@ public class ShardReadWriteTransaction extends ShardTransaction { } else if (MergeData.SERIALIZABLE_CLASS.equals(message.getClass())) { mergeData(transaction, MergeData.fromSerializable(message, schemaContext)); } else if (DeleteData.SERIALIZABLE_CLASS.equals(message.getClass())) { - deleteData(transaction,DeleteData.fromSerizalizable(message)); + deleteData(transaction,DeleteData.fromSerializable(message)); } else if (ReadyTransaction.SERIALIZABLE_CLASS.equals(message.getClass())) { readyTransaction(transaction,new ReadyTransaction()); + } else if(DataExists.SERIALIZABLE_CLASS.equals(message.getClass())) { + dataExists(transaction, DataExists.fromSerializable(message)); }else { super.handleReceive(message); } @@ -65,4 +68,13 @@ public class ShardReadWriteTransaction extends ShardTransaction { getSender().tell(new CloseTransactionReply().toSerializable(), getSelf()); getSelf().tell(PoisonPill.getInstance(), getSelf()); } + + /** + * The following method is used in unit testing only + * hence the default scope. + * This is done to test out failure cases. + */ + public void forUnitTestOnlyExplicitTransactionClose() { + transaction.close(); + } }