Fix runtime type search

[mdsal.git] / binding / mdsal-binding-generator / src / main / java / org / opendaylight / mdsal / binding / generator / impl / reactor / CompositeRuntimeTypeBuilder.java

diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CompositeRuntimeTypeBuilder.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CompositeRuntimeTypeBuilder.java
index 4c13f3d5bb04b399bd3f401e1552d8f06a751fec..2902087d31275db23766c92dcf548a98dbbb276f 100644 (file)
--- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CompositeRuntimeTypeBuilder.java
+++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/CompositeRuntimeTypeBuilder.java
@@ -137,7 +137,7 @@ abstract class CompositeRuntimeTypeBuilder<S extends EffectiveStatement<?, ?>, R
             }
         }
 
-        // ... and groupings recursively last
+        // ... groupings recursively next ...
         for (var grouping : parent.groupings()) {
             final AbstractExplicitGenerator<S, ?> found = findChildGenerator(grouping, localName);
             if (found != null) {
@@ -145,6 +145,8 @@ abstract class CompositeRuntimeTypeBuilder<S extends EffectiveStatement<?, ?>, R
             }
         }
 
-        return null;
+        // ... and finally anything along instantiation axis ...
+        final var origParent = (AbstractCompositeGenerator<?, ?>) parent.previous();
+        return origParent == null ? null : findChildGenerator(origParent, localName);
     }
 }