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=2421cce26c0afa6f7a7c7cc3cf6b5da5830f6fd0;hp=ee38d1918e13442dc6983a40cabc6ac64e77b65e;hb=4639f61a41a93d6a762af97b819d164781b0f9f8;hpb=4062f5241a2a6f58ffb83dd1e9939ee66122d217 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 ee38d1918e..2421cce26c 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 @@ -15,6 +15,7 @@ import akka.actor.ReceiveTimeout; import akka.japi.Creator; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActorWithMetering; import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats; import org.opendaylight.controller.cluster.datastore.messages.CloseTransaction; @@ -42,9 +43,9 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public abstract class ShardTransaction extends AbstractUntypedActorWithMetering { private final ActorRef shardActor; private final ShardStats shardStats; - private final String transactionID; + private final TransactionIdentifier transactionID; - protected ShardTransaction(ActorRef shardActor, ShardStats shardStats, String transactionID) { + protected ShardTransaction(ActorRef shardActor, ShardStats shardStats, TransactionIdentifier transactionID) { super("shard-tx"); //actor name override used for metering. This does not change the "real" actor name this.shardActor = shardActor; this.shardStats = shardStats; @@ -62,7 +63,7 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering return shardActor; } - protected String getTransactionID() { + protected final TransactionIdentifier getTransactionID() { return transactionID; }