X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Fmapping%2Fattributes%2Fresolving%2FUnionCompositeAttributeResolvingStrategy.java;h=4cab995d4ebf093758bfbc27e29611b647d60307;hb=77bf9003bfe58d57a860164ffcfe7cf3deb8c1be;hp=bc99ecf09a90b480f71b6444776fefc354177559;hpb=5cebad0c07f3d15d42be522cf484fa6eea3d7c88;p=controller.git diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/resolving/UnionCompositeAttributeResolvingStrategy.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/resolving/UnionCompositeAttributeResolvingStrategy.java index bc99ecf09a..4cab995d4e 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/resolving/UnionCompositeAttributeResolvingStrategy.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/resolving/UnionCompositeAttributeResolvingStrategy.java @@ -10,11 +10,10 @@ package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attri import com.google.common.base.Preconditions; import com.google.common.collect.Maps; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.JavaAttribute; - +import java.util.Map; import javax.management.openmbean.CompositeType; import javax.management.openmbean.OpenType; -import java.util.Map; +import org.opendaylight.controller.config.yangjmxgenerator.attribute.JavaAttribute; final class UnionCompositeAttributeResolvingStrategy extends CompositeAttributeResolvingStrategy { @@ -34,10 +33,11 @@ final class UnionCompositeAttributeResolvingStrategy extends CompositeAttributeR Map newMap = Maps.newHashMap(); for (String key : openType.keySet()) { - if (openType.getDescription(key).equals(JavaAttribute.DESCRIPTION_OF_VALUE_ATTRIBUTE_FOR_UNION)) + if (openType.getDescription(key).equals(JavaAttribute.DESCRIPTION_OF_VALUE_ATTRIBUTE_FOR_UNION)){ newMap.put(key, valueMap.get(JavaAttribute.DESCRIPTION_OF_VALUE_ATTRIBUTE_FOR_UNION)); - else + } else { newMap.put(key, null); + } } return newMap; }