X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Fmapping%2Fruntime%2FInstanceRuntime.java;h=44227bb4d816042c3aae502a52102da49ce2e534;hb=8720a3f3498bbc6fab675431f4200d26641a8ec8;hp=6a49275f260d7c0d047d3b3642d1886b35458b93;hpb=7e0e35596dde2a0cbcf077b26f9797b6e0cdfa43;p=controller.git diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/runtime/InstanceRuntime.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/runtime/InstanceRuntime.java index 6a49275f26..44227bb4d8 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/runtime/InstanceRuntime.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/runtime/InstanceRuntime.java @@ -80,10 +80,7 @@ public class InstanceRuntime { if (on.getKeyPropertyList().size() != keyListSize + 1){ return false; } - if (!on.getKeyPropertyList().containsKey(string)){ - return false; - } - return true; + return on.getKeyPropertyList().containsKey(string); } })); } @@ -94,7 +91,7 @@ public class InstanceRuntime { public Element toXml(ObjectName rootOn, Set childRbeOns, Document document, String instanceIndex, Element parentElement, String namespace) { - Element xml = instanceMapping.toXml(rootOn, null, namespace, document, parentElement); + Element xml = instanceMapping.toXml(rootOn, namespace, document, parentElement); if (instanceIndex != null) { xml.setAttribute(KEY_ATTRIBUTE_KEY, instanceIndex);