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%2Fdatabroker%2FAbstractDOMBrokerWriteTransaction.java;h=0fe26ed48dae5d8b68dc41f22c617ea78d3da8bd;hp=500ccdf5d587dd3b5d753c93a51d42fb8bbaba7d;hb=ef3b9a8300db1c791f2c4088d39152ccf9f5b97c;hpb=a03837fe4b8629645788de8a48b453402d6819de diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java index 500ccdf5d5..0fe26ed48d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java @@ -35,10 +35,14 @@ import org.slf4j.LoggerFactory; public abstract class AbstractDOMBrokerWriteTransaction extends AbstractDOMBrokerTransaction implements DOMDataWriteTransaction { - private static final AtomicReferenceFieldUpdater IMPL_UPDATER = - AtomicReferenceFieldUpdater.newUpdater(AbstractDOMBrokerWriteTransaction.class, AbstractDOMTransactionFactory.class, "commitImpl"); + @SuppressWarnings("rawtypes") + private static final AtomicReferenceFieldUpdater + IMPL_UPDATER = AtomicReferenceFieldUpdater.newUpdater(AbstractDOMBrokerWriteTransaction.class, + AbstractDOMTransactionFactory.class, "commitImpl"); + @SuppressWarnings("rawtypes") private static final AtomicReferenceFieldUpdater FUTURE_UPDATER = - AtomicReferenceFieldUpdater.newUpdater(AbstractDOMBrokerWriteTransaction.class, Future.class, "commitFuture"); + AtomicReferenceFieldUpdater.newUpdater(AbstractDOMBrokerWriteTransaction.class, Future.class, + "commitFuture"); private static final Logger LOG = LoggerFactory.getLogger(AbstractDOMBrokerWriteTransaction.class); private static final Future CANCELLED_FUTURE = Futures.immediateCancelledFuture(); @@ -53,7 +57,7 @@ public abstract class AbstractDOMBrokerWriteTransaction * Lazy set is safe for use because it is only referenced to in the * {@link #cancel()} slow path, where we will busy-wait for it. The * fast path gets the benefit of a store-store barrier instead of the @@ -62,13 +66,15 @@ public abstract class AbstractDOMBrokerWriteTransaction commitFuture; protected AbstractDOMBrokerWriteTransaction(final Object identifier, - final Map storeTxFactories, final AbstractDOMTransactionFactory commitImpl) { + final Map storeTxFactories, + final AbstractDOMTransactionFactory commitImpl) { super(identifier, storeTxFactories); this.commitImpl = Preconditions.checkNotNull(commitImpl, "commitImpl must not be null."); } @Override - public void put(final LogicalDatastoreType store, final YangInstanceIdentifier path, final NormalizedNode data) { + public void put(final LogicalDatastoreType store, final YangInstanceIdentifier path, + final NormalizedNode data) { checkRunning(commitImpl); checkInstanceIdentifierReferencesData(path,data); getSubtransaction(store).write(path, data); @@ -78,7 +84,7 @@ public abstract class AbstractDOMBrokerWriteTransaction data) { final PathArgument lastArg = path.getLastPathArgument(); Preconditions.checkArgument( - (lastArg == data.getIdentifier()) || (lastArg != null && lastArg.equals(data.getIdentifier())), + lastArg == data.getIdentifier() || lastArg != null && lastArg.equals(data.getIdentifier()), "Instance identifier references %s but data identifier is %s", lastArg, data); } @@ -89,7 +95,8 @@ public abstract class AbstractDOMBrokerWriteTransaction data) { + public void merge(final LogicalDatastoreType store, final YangInstanceIdentifier path, + final NormalizedNode data) { checkRunning(commitImpl); checkInstanceIdentifierReferencesData(path, data); getSubtransaction(store).merge(path, data); @@ -110,7 +117,8 @@ public abstract class AbstractDOMBrokerWriteTransaction future; do { future = commitFuture; - } while (future == null); + } + while (future == null); return future.cancel(false); }