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%2Fsal%2Fdom%2Fbroker%2Fimpl%2FSchemaAwareDataStoreAdapter.java;h=3cd7ed5e13ed16b2449f2386604aa81802679b17;hb=0e7b83c0739ac579ca6dbf6a3f7992f70eb3000f;hp=1a572d157dba9f8272140495b8eabf9669df11bc;hpb=aae09dbf11186d2cd30fe87692f746519b0958f9;p=controller.git diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java index 1a572d157d..3cd7ed5e13 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java @@ -9,6 +9,11 @@ package org.opendaylight.controller.sal.dom.broker.impl; import static com.google.common.base.Preconditions.checkState; +import com.google.common.base.Predicate; +import com.google.common.collect.FluentIterable; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; + import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; @@ -40,10 +45,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContextListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Predicate; -import com.google.common.collect.FluentIterable; -import com.google.common.collect.ImmutableSet; - public class SchemaAwareDataStoreAdapter extends AbstractLockableDelegator implements // DataStore, // SchemaContextListener, // @@ -235,7 +236,7 @@ AutoCloseable { public CompositeNode readConfigurationData(final InstanceIdentifier path) { getDelegateReadLock().lock(); try { - if (path.getPath().isEmpty()) { + if (Iterables.isEmpty(path.getPathArguments())) { return null; } QName qname = null; @@ -278,7 +279,7 @@ AutoCloseable { public CompositeNode readOperationalData(final InstanceIdentifier path) { getDelegateReadLock().lock(); try { - if (path.getPath().isEmpty()) { + if (Iterables.isEmpty(path.getPathArguments())) { return null; } QName qname = null;