From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 30 Jan 2021 20:38:47 +0000 (+0100)
Subject: Do not use TypeDefinition copying just yet
X-Git-Tag: v7.0.0~245
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=7a1cb7418c958f692ce37d4f47e33368310ed4f1;p=yangtools.git

Do not use TypeDefinition copying just yet

The conditions under which it is safe to copy a typedefinition
are not clear. Revert that bit and let's do a simultaneous conversion
with leaf.

JIRA: YANGTOOLS-1208
Change-Id: Ia4178cd621bc739c3ad2870646fdae0b818065a9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java
index 228acaec26..2b9dd23499 100644
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/AbstractLeafListEffectiveStatement.java
@@ -26,7 +26,6 @@ import org.opendaylight.yangtools.yang.model.api.stmt.TypeEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.util.type.ConcreteTypeBuilder;
 import org.opendaylight.yangtools.yang.model.util.type.ConcreteTypes;
-import org.opendaylight.yangtools.yang.model.util.type.TypeBuilder;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredEffectiveStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.DataSchemaNodeMixin;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.MustConstraintMixin;
@@ -58,7 +57,8 @@ abstract class AbstractLeafListEffectiveStatement
         this.substatements = original.substatements;
         this.path = path;
         this.flags = flags;
-        this.type = TypeBuilder.copyTypeDefinition(original.type, getQName());
+        // FIXME: share with original?
+        this.type = buildType();
     }
 
     @Override