From 9150be094b25f000a71898b6976a1a9359cfdf50 Mon Sep 17 00:00:00 2001 From: Martin Vitez Date: Wed, 7 Aug 2013 11:22:40 +0200 Subject: [PATCH] Fixed NPE when dealing with union and identityref types. Change-Id: Ib866d9d6deb300345741fd36702af8cb3c8f043c Signed-off-by: Martin Vitez --- .../yang/parser/builder/impl/IdentityrefTypeBuilder.java | 8 +++----- .../yang/parser/builder/impl/UnionTypeBuilder.java | 3 ++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java index 9e578d6c03..e43af791c9 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java @@ -18,16 +18,14 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; +import org.opendaylight.yangtools.yang.model.util.BaseTypes; import org.opendaylight.yangtools.yang.model.util.IdentityrefType; import org.opendaylight.yangtools.yang.parser.builder.api.AbstractTypeAwareBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder; import org.opendaylight.yangtools.yang.parser.util.YangParseException; /** - * Builder for YANG union type. User can add type to this union as - * TypeDefinition object (resolved type) or in form of TypeDefinitionBuilder. - * When build is called, types in builder form will be built and add to resolved - * types. + * Builder for YANG identityref type. */ public final class IdentityrefTypeBuilder extends AbstractTypeAwareBuilder implements TypeDefinitionBuilder { private static final String NAME = "identityref"; @@ -37,7 +35,7 @@ public final class IdentityrefTypeBuilder extends AbstractTypeAwareBuilder imple private QName baseQName; IdentityrefTypeBuilder(final String moduleName, final int line, final String baseString, final SchemaPath schemaPath) { - super(moduleName, line, null); + super(moduleName, line, BaseTypes.constructQName(NAME)); this.baseString = baseString; this.schemaPath = schemaPath; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java index 7e6ff2ad05..49f39d1dfc 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UnionTypeBuilder.java @@ -18,6 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; +import org.opendaylight.yangtools.yang.model.util.BaseTypes; import org.opendaylight.yangtools.yang.model.util.UnionType; import org.opendaylight.yangtools.yang.parser.builder.api.AbstractTypeAwareBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder; @@ -40,7 +41,7 @@ public final class UnionTypeBuilder extends AbstractTypeAwareBuilder implements private SchemaPath path; public UnionTypeBuilder(final String moduleName, final int line) { - super(moduleName, line, null); + super(moduleName, line, BaseTypes.constructQName(NAME)); types = new ArrayList>(); typedefs = new ArrayList(); } -- 2.36.6