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%2FDOMDataBrokerImpl.java;h=608ac9bc68d120c39d96b0389bbed324ba01652e;hb=dc1a275c3c1ea8949dd3a607e08ee4624e758511;hp=64a5606e3fb613a04a70a76cff65a83759cdd589;hpb=592a53d5da7e33c0febd9654c9567c4074d1a722;p=controller.git diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerImpl.java index 64a5606e3f..608ac9bc68 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerImpl.java @@ -217,8 +217,7 @@ public class DOMDataBrokerImpl implements DOMDataBroker, AutoCloseable { @Override public void merge(final LogicalDatastoreType store, final InstanceIdentifier path, final NormalizedNode data) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Not implemented yet."); + getSubtransaction(store).merge(path,data); } @Override @@ -251,12 +250,6 @@ public class DOMDataBrokerImpl implements DOMDataBroker, AutoCloseable { final InstanceIdentifier path) { return getSubtransaction(store).read(path); } - - @Override - public void merge(final LogicalDatastoreType store, final InstanceIdentifier path, - final NormalizedNode data) { - - } } private final class CommitCoordination implements Callable> {