From bea73749199179ffc19184c717dd4c585185ccb7 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 16 Dec 2015 14:55:09 +0100 Subject: [PATCH] Guard against null transaction IDs This pushes down the null guards so that we can track down the source of nulls. Change-Id: Id94db7ba1810b2331f625f335ee610b3a22b3c44 Signed-off-by: Robert Varga --- .../controller/cluster/datastore/ShardTransaction.java | 4 ++-- .../cluster/datastore/messages/CreateTransaction.java | 3 ++- .../cluster/datastore/messages/ForwardedReadyTransaction.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) 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 4f59f9feb5..6597ce365c 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 @@ -58,7 +58,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; } @@ -164,7 +164,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; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java index ea3caef093..21f16e7bfe 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java @@ -9,6 +9,7 @@ package org.opendaylight.controller.cluster.datastore.messages; +import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.datastore.DataStoreVersions; import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages; @@ -32,7 +33,7 @@ public class CreateTransaction implements SerializableMessage { private CreateTransaction(String transactionId, int transactionType, String transactionChainId, short version) { - this.transactionId = transactionId; + this.transactionId = Preconditions.checkNotNull(transactionId); this.transactionType = transactionType; this.transactionChainId = transactionChainId; this.version = version; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java index b3d7f2c2d6..e30d2055c9 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java @@ -25,7 +25,7 @@ public class ForwardedReadyTransaction { public ForwardedReadyTransaction(String transactionID, short txnClientVersion, ReadWriteShardDataTreeTransaction transaction, boolean returnSerialized, boolean doImmediateCommit) { - this.transactionID = transactionID; + this.transactionID = Preconditions.checkNotNull(transactionID); this.transaction = Preconditions.checkNotNull(transaction); this.returnSerialized = returnSerialized; this.txnClientVersion = txnClientVersion; -- 2.36.6