Optimize LeafListEffectiveStatement layout

[yangtools.git] / model / yang-model-ri / src / main / java / org / opendaylight / yangtools / yang / model / ri / stmt / EffectiveStatements.java

diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java
index dbc2e2701e99e5cb91f0dd8cf9d46c82ea6e7ba4..aec44da1e449a96878765d08f494a0f7a3ae5b6c 100644 (file)
--- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java
+++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java
@@ -588,8 +588,8 @@ public final class EffectiveStatements {
             final ImmutableSet<String> defaultValues, final @Nullable ElementCountConstraint elementCountConstraint)
                 throws SubstatementIndexingException {
         if (defaultValues.isEmpty()) {
-            return elementCountConstraint == null
-                ? new EmptyLeafListEffectiveStatement(declared, argument, flags, substatements)
+            return elementCountConstraint == null && argument.equals(declared.argument())
+                ? new EmptyLeafListEffectiveStatement(declared, flags, substatements)
                     : new SlimLeafListEffectiveStatement(declared, argument, flags, substatements,
                         elementCountConstraint);
         }