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%2FShardWriteTransaction.java;h=56683073cfc5dab4700a482646c467626fa1f49a;hp=4ae54d3e5f727856c93a6f896e7630f21e11c10d;hb=b00bee7547dbba0677347e991a8674f90752f6a2;hpb=4062f5241a2a6f58ffb83dd1e9939ee66122d217

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java
index 4ae54d3e5f..56683073cf 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java
@@ -11,6 +11,7 @@ package org.opendaylight.controller.cluster.datastore;
 
 import akka.actor.ActorRef;
 import akka.actor.PoisonPill;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats;
 import org.opendaylight.controller.cluster.datastore.messages.BatchedModifications;
 import org.opendaylight.controller.cluster.datastore.messages.BatchedModificationsReply;
@@ -20,8 +21,9 @@ import org.opendaylight.controller.cluster.datastore.messages.ReadData;
 import org.opendaylight.controller.cluster.datastore.modification.Modification;
 
 /**
+ * Actor for a shard write-only transaction.
+ *
  * @author: syedbahm
- * Date: 8/6/14
  */
 public class ShardWriteTransaction extends ShardTransaction {
 
@@ -31,7 +33,7 @@ public class ShardWriteTransaction extends ShardTransaction {
 
     public ShardWriteTransaction(ReadWriteShardDataTreeTransaction transaction, ActorRef shardActor,
             ShardStats shardStats) {
-        super(shardActor, shardStats, transaction.getId());
+        super(shardActor, shardStats, transaction.getIdentifier());
         this.transaction = transaction;
     }
 
@@ -49,6 +51,7 @@ public class ShardWriteTransaction extends ShardTransaction {
         }
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     private void batchedModifications(BatchedModifications batched) {
         if (checkClosed()) {
             if (batched.isReady()) {
@@ -58,17 +61,17 @@ public class ShardWriteTransaction extends ShardTransaction {
         }
 
         try {
-            for(Modification modification: batched.getModifications()) {
+            for (Modification modification: batched.getModifications()) {
                 modification.apply(transaction.getSnapshot());
             }
 
             totalBatchedModificationsReceived++;
-            if(batched.isReady()) {
-                if(lastBatchedModificationsException != null) {
+            if (batched.isReady()) {
+                if (lastBatchedModificationsException != null) {
                     throw lastBatchedModificationsException;
                 }
 
-                if(totalBatchedModificationsReceived != batched.getTotalMessagesSent()) {
+                if (totalBatchedModificationsReceived != batched.getTotalMessagesSent()) {
                     throw new IllegalStateException(String.format(
                             "The total number of batched messages received %d does not match the number sent %d",
                             totalBatchedModificationsReceived, batched.getTotalMessagesSent()));
@@ -82,7 +85,7 @@ public class ShardWriteTransaction extends ShardTransaction {
             lastBatchedModificationsException = e;
             getSender().tell(new akka.actor.Status.Failure(e), getSelf());
 
-            if(batched.isReady()) {
+            if (batched.isReady()) {
                 getSelf().tell(PoisonPill.getInstance(), getSelf());
             }
         }
@@ -98,7 +101,8 @@ public class ShardWriteTransaction extends ShardTransaction {
 
     private boolean checkClosed() {
         if (transaction.isClosed()) {
-            getSender().tell(new akka.actor.Status.Failure(new IllegalStateException("Transaction is closed, no modifications allowed")), getSelf());
+            getSender().tell(new akka.actor.Status.Failure(new IllegalStateException(
+                    "Transaction is closed, no modifications allowed")), getSelf());
             return true;
         } else {
             return false;
@@ -106,7 +110,7 @@ public class ShardWriteTransaction extends ShardTransaction {
     }
 
     private void readyTransaction(boolean returnSerialized, boolean doImmediateCommit, short clientTxVersion) {
-        String transactionID = getTransactionID();
+        TransactionIdentifier transactionID = getTransactionId();
 
         LOG.debug("readyTransaction : {}", transactionID);