X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=dom%2Fmdsal-dom-spi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fdom%2Fspi%2Fstore%2FAbstractSnapshotBackedTransactionChain.java;h=85012c39b2dc727082302cd566b1c8836040a1f5;hb=11408d627adca7eb71ac956c3ad01f75b6b91596;hp=79453ca76fa68eb521f3f937cbafde6ab9473146;hpb=1372ec96f3406ef72b8f5e09936ee35aa4cfa78e;p=mdsal.git diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractSnapshotBackedTransactionChain.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractSnapshotBackedTransactionChain.java index 79453ca76f..85012c39b2 100644 --- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractSnapshotBackedTransactionChain.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractSnapshotBackedTransactionChain.java @@ -14,9 +14,10 @@ import com.google.common.annotations.Beta; import java.util.AbstractMap.SimpleEntry; import java.util.Map.Entry; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; +import org.opendaylight.mdsal.dom.spi.store.SnapshotBackedReadTransaction.TransactionClosePrototype; import org.opendaylight.mdsal.dom.spi.store.SnapshotBackedWriteTransaction.TransactionReadyPrototype; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot; +import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification; +import org.opendaylight.yangtools.yang.data.tree.api.DataTreeSnapshot; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +29,7 @@ import org.slf4j.LoggerFactory; */ @Beta public abstract class AbstractSnapshotBackedTransactionChain - extends TransactionReadyPrototype implements DOMStoreTransactionChain { + extends TransactionReadyPrototype implements DOMStoreTransactionChain, TransactionClosePrototype { private abstract static class State { /** * Allocate a new snapshot. @@ -131,7 +132,12 @@ public abstract class AbstractSnapshotBackedTransactionChain protected DOMStoreReadTransaction newReadOnlyTransaction(final T transactionId) { final Entry entry = getSnapshot(); return SnapshotBackedTransactions.newReadTransaction(transactionId, - getDebugTransactions(), entry.getValue()); + getDebugTransactions(), entry.getValue(), this); + } + + @Override + public void transactionClosed(final SnapshotBackedReadTransaction tx) { + // Defaults to no-op } @Override @@ -178,9 +184,8 @@ public abstract class AbstractSnapshotBackedTransactionChain if (allocated.getTransaction().equals(tx)) { final boolean success = STATE_UPDATER.compareAndSet(this, localState, idleState); if (!success) { - LOG.warn("Transaction {} aborted, but chain {} s" - + "tate already transitioned from {} to {}, very strange", - tx, this, localState, state); + LOG.warn("Transaction {} aborted, but chain {} state already transitioned from {} to {}, " + + "very strange", tx, this, localState, state); } } }