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%2FReadWriteShardDataTreeTransaction.java;h=7d0cbb0cd63847a6ad56ba045c4a33d6a6286539;hb=99f80f27bee37bb23e345420bf14bb7bb4793c28;hp=771de8cd12e6f5a31440c7edbf244103e7852832;hpb=4d1709660b7af992d4c382a2a38debb5c7d64fb9;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ReadWriteShardDataTreeTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ReadWriteShardDataTreeTransaction.java
index 771de8cd12..7d0cbb0cd6 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ReadWriteShardDataTreeTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ReadWriteShardDataTreeTransaction.java
@@ -8,28 +8,20 @@
 package org.opendaylight.controller.cluster.datastore;
 
 import com.google.common.base.Preconditions;
+import java.util.Optional;
+import java.util.SortedSet;
 import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification;
 
 public final class ReadWriteShardDataTreeTransaction extends AbstractShardDataTreeTransaction<DataTreeModification> {
-    private final ShardDataTreeTransactionParent parent;
 
-    protected ReadWriteShardDataTreeTransaction(final ShardDataTreeTransactionParent parent,
-            final TransactionIdentifier id, final DataTreeModification modification) {
-        super(id, modification);
-        this.parent = Preconditions.checkNotNull(parent);
+    ReadWriteShardDataTreeTransaction(final ShardDataTreeTransactionParent parent, final TransactionIdentifier id,
+        final DataTreeModification modification) {
+        super(parent, id, modification);
     }
 
-    @Override
-    void abort() {
+    ShardDataTreeCohort ready(final Optional<SortedSet<String>> participatingShardNames) {
         Preconditions.checkState(close(), "Transaction is already closed");
-
-        parent.abortTransaction(this);
-    }
-
-    ShardDataTreeCohort ready() {
-        Preconditions.checkState(close(), "Transaction is already closed");
-
-        return parent.finishTransaction(this);
+        return getParent().finishTransaction(this, participatingShardNames);
     }
 }