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%2FShardTransaction.java;h=3d54b4e8147c01e4f3d8f89a98421a4858c69442;hp=600ec393971ffe72efd12dfaaaf472cc61edd204;hb=80f668c77ef358ba5fbc53b0332597bd2c4844c2;hpb=412db94945c5db5d2da918f5e23bd3abcecc4d10 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..3d54b4e814 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,10 +37,6 @@ 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} *

    */ @@ -59,7 +54,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; } @@ -165,7 +160,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; }