X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fbroker%2Fimpl%2FDOMDataBrokerTransactionChainImpl.java;h=4e5751472e34dc5fe365abe01e43c326667f8c32;hp=0b1dd1c5e0df481773a598ab3d99fa814e448187;hb=89b1c5b7d66614d1b98ec14abc3326fb878eb056;hpb=b3e553ce5b3d3e972cbe19465ab7af2fcb39934c diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java old mode 100644 new mode 100755 index 0b1dd1c5e0..4e5751472e --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java @@ -1,15 +1,18 @@ /* * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ + package org.opendaylight.controller.md.sal.dom.broker.impl; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; +import java.util.Collection; import java.util.Map; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLong; @@ -32,7 +35,7 @@ import org.slf4j.LoggerFactory; */ final class DOMDataBrokerTransactionChainImpl extends AbstractDOMForwardedTransactionFactory implements DOMTransactionChain { - private static enum State { + private enum State { RUNNING, CLOSING, CLOSED, @@ -45,7 +48,7 @@ final class DOMDataBrokerTransactionChainImpl extends AbstractDOMForwardedTransa AtomicReferenceFieldUpdater.newUpdater(DOMDataBrokerTransactionChainImpl.class, State.class, "state"); private static final Logger LOG = LoggerFactory.getLogger(DOMDataBrokerTransactionChainImpl.class); private final AtomicLong txNum = new AtomicLong(); - private final DOMDataCommitExecutor coordinator; + private final AbstractDOMDataBroker broker; private final TransactionChainListener listener; private final long chainId; @@ -58,7 +61,7 @@ final class DOMDataBrokerTransactionChainImpl extends AbstractDOMForwardedTransa * ID of transaction chain * @param chains * Backing {@link DOMStoreTransactionChain}s. - * @param coordinator + * @param broker * Commit Coordinator which should be used to coordinate commits * of transaction * produced by this chain. @@ -69,10 +72,10 @@ final class DOMDataBrokerTransactionChainImpl extends AbstractDOMForwardedTransa */ public DOMDataBrokerTransactionChainImpl(final long chainId, final Map chains, - final DOMDataCommitExecutor coordinator, final TransactionChainListener listener) { + final AbstractDOMDataBroker broker, final TransactionChainListener listener) { super(chains); this.chainId = chainId; - this.coordinator = Preconditions.checkNotNull(coordinator); + this.broker = Preconditions.checkNotNull(broker); this.listener = Preconditions.checkNotNull(listener); } @@ -87,11 +90,11 @@ final class DOMDataBrokerTransactionChainImpl extends AbstractDOMForwardedTransa @Override public CheckedFuture submit( - final DOMDataWriteTransaction transaction, final Iterable cohorts) { + final DOMDataWriteTransaction transaction, final Collection cohorts) { checkNotFailed(); checkNotClosed(); - final CheckedFuture ret = coordinator.submit(transaction, cohorts); + final CheckedFuture ret = broker.submit(transaction, cohorts); COUNTER_UPDATER.incrementAndGet(this); Futures.addCallback(ret, new FutureCallback() {