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%2FShardTransaction.java;h=82770a20bd4c87ea04a65728b54a89631c9b9b70;hb=refs%2Fchanges%2F78%2F33178%2F3;hp=600ec393971ffe72efd12dfaaaf472cc61edd204;hpb=2727bea09c83646b6cbd2ef9672d0b7f6cf3b22f;p=controller.git
diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java
index 600ec39397..82770a20bd 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java
@@ -16,7 +16,6 @@ import akka.japi.Creator;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActorWithMetering;
-import org.opendaylight.controller.cluster.datastore.TransactionProxy.TransactionType;
import org.opendaylight.controller.cluster.datastore.exceptions.UnknownMessageException;
import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats;
import org.opendaylight.controller.cluster.datastore.messages.CloseTransaction;
@@ -38,17 +37,10 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
* Handles Messages
* ----------------
*
{@link org.opendaylight.controller.cluster.datastore.messages.ReadData}
- * {@link org.opendaylight.controller.cluster.datastore.messages.WriteData}
- * {@link org.opendaylight.controller.cluster.datastore.messages.MergeData}
- * {@link org.opendaylight.controller.cluster.datastore.messages.DeleteData}
- * {@link org.opendaylight.controller.cluster.datastore.messages.ReadyTransaction}
* {@link org.opendaylight.controller.cluster.datastore.messages.CloseTransaction}
*
*/
public abstract class ShardTransaction extends AbstractUntypedActorWithMetering {
-
- protected static final boolean SERIALIZED_REPLY = true;
-
private final ActorRef shardActor;
private final ShardStats shardStats;
private final String transactionID;
@@ -59,7 +51,7 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering
super("shard-tx"); //actor name override used for metering. This does not change the "real" actor name
this.shardActor = shardActor;
this.shardStats = shardStats;
- this.transactionID = transactionID;
+ this.transactionID = Preconditions.checkNotNull(transactionID);
this.clientTxVersion = clientTxVersion;
}
@@ -85,7 +77,7 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering
@Override
public void handleReceive(Object message) throws Exception {
- if (message.getClass().equals(CloseTransaction.SERIALIZABLE_CLASS)) {
+ if (CloseTransaction.isSerializedType(message)) {
closeTransaction(true);
} else if (message instanceof ReceiveTimeout) {
if(LOG.isDebugEnabled()) {
@@ -105,7 +97,7 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering
getDOMStoreTransaction().abort();
if(sendReply && returnCloseTransactionReply()) {
- getSender().tell(CloseTransactionReply.INSTANCE.toSerializable(), getSelf());
+ getSender().tell(new CloseTransactionReply(), getSelf());
}
getSelf().tell(PoisonPill.getInstance(), getSelf());
@@ -120,31 +112,25 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering
return ret;
}
- protected void readData(AbstractShardDataTreeTransaction> transaction, ReadData message,
- final boolean returnSerialized) {
-
+ protected void readData(AbstractShardDataTreeTransaction> transaction, ReadData message) {
if (checkClosed(transaction)) {
return;
}
final YangInstanceIdentifier path = message.getPath();
Optional> optional = transaction.getSnapshot().readNode(path);
- ReadDataReply readDataReply = new ReadDataReply(optional.orNull(), clientTxVersion);
- sender().tell((returnSerialized ? readDataReply.toSerializable(): readDataReply), self());
+ ReadDataReply readDataReply = new ReadDataReply(optional.orNull(), message.getVersion());
+ sender().tell(readDataReply.toSerializable(), self());
}
- protected void dataExists(AbstractShardDataTreeTransaction> transaction, DataExists message,
- final boolean returnSerialized) {
-
+ protected void dataExists(AbstractShardDataTreeTransaction> transaction, DataExists message) {
if (checkClosed(transaction)) {
return;
}
final YangInstanceIdentifier path = message.getPath();
boolean exists = transaction.getSnapshot().readNode(path).isPresent();
- DataExistsReply dataExistsReply = DataExistsReply.create(exists);
- getSender().tell(returnSerialized ? dataExistsReply.toSerializable() :
- dataExistsReply, getSelf());
+ getSender().tell(new DataExistsReply(exists, message.getVersion()).toSerializable(), getSelf());
}
private static class ShardTransactionCreator implements Creator {
@@ -165,7 +151,7 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering
this.shardActor = shardActor;
this.shardStats = shardStats;
this.datastoreContext = datastoreContext;
- this.transactionID = transactionID;
+ this.transactionID = Preconditions.checkNotNull(transactionID);
this.txnClientVersion = txnClientVersion;
this.type = type;
}