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%2Fstore%2Fimpl%2Ftree%2Fdata%2FInMemoryDataTree.java;h=f04e379dd95824dd965c0ac8c5c998d9f0dafd83;hb=8720a3f3498bbc6fab675431f4200d26641a8ec8;hp=5a300a071d927e442e706c337cb8eb0dc6540d39;hpb=c3c49eaef5b1435b871f97eb060f8abdba5a6671;p=controller.git diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/data/InMemoryDataTree.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/data/InMemoryDataTree.java index 5a300a071d..f04e379dd9 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/data/InMemoryDataTree.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/data/InMemoryDataTree.java @@ -14,6 +14,7 @@ import org.opendaylight.controller.md.sal.dom.store.impl.tree.DataPreconditionFa import org.opendaylight.controller.md.sal.dom.store.impl.tree.DataTree; import org.opendaylight.controller.md.sal.dom.store.impl.tree.DataTreeCandidate; import org.opendaylight.controller.md.sal.dom.store.impl.tree.DataTreeModification; +import org.opendaylight.controller.md.sal.dom.store.impl.tree.ModificationType; import org.opendaylight.controller.md.sal.dom.store.impl.tree.StoreUtils; import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -127,7 +128,7 @@ final class InMemoryDataTree implements DataTree { rwLock.writeLock().lock(); try { Preconditions.checkState(c.getBeforeRoot() == rootNode, - String.format("Store snapshot %s and transaction snapshot %s differ.", rootNode, c.getBeforeRoot())); + String.format("Store tree %s and candidate base %s differ.", rootNode, c.getBeforeRoot())); this.rootNode = c.getAfterRoot(); } finally { rwLock.writeLock().unlock();