X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fbroker%2Fimpl%2FPingPongTransactionChain.java;h=0e96e81587a23168ceadda7198628be478c3e71d;hb=refs%2Fchanges%2F28%2F81128%2F25;hp=af474c5c56c5370e9d6b2c7845e42a27d8984ea7;hpb=7daddd72031b33ed686abe18a0813e41263aac8d;p=controller.git diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransactionChain.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransactionChain.java index af474c5c56..0e96e81587 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransactionChain.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransactionChain.java @@ -20,7 +20,8 @@ import java.util.AbstractMap.SimpleImmutableEntry; import java.util.Map.Entry; import java.util.concurrent.CancellationException; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -import javax.annotation.concurrent.GuardedBy; +import org.checkerframework.checker.lock.qual.GuardedBy; +import org.checkerframework.checker.lock.qual.Holding; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.controller.md.sal.common.api.data.AsyncTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; @@ -210,7 +211,7 @@ public final class PingPongTransactionChain implements DOMTransactionChain { * this method has completed executing. Also inflightTx may be updated outside * the lock, hence we need to re-check. */ - @GuardedBy("this") + @Holding("this") private void processIfReady() { if (inflightTx == null) { final PingPongTransaction tx = READY_UPDATER.getAndSet(this, null); @@ -226,7 +227,7 @@ public final class PingPongTransactionChain implements DOMTransactionChain { * * @param tx Transaction which needs processing. */ - @GuardedBy("this") + @Holding("this") private void processTransaction(final @NonNull PingPongTransaction tx) { if (failed) { LOG.debug("Cancelling transaction {}", tx);