From: Martin Vitez <mvitez@cisco.com>
Date: Wed, 27 Nov 2013 12:00:36 +0000 (+0100)
Subject: Fixed bug in generating code for augment.
X-Git-Tag: yangtools-0.6.0~166
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=48a8ce6937e709931853d38106d18ab89a58090b;hp=95d24a6ef06797e525633bf5fc468864819422c0;p=yangtools.git

Fixed bug in generating code for augment.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
---

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.xtend b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.xtend
index b3926169cf..702dd0d7e5 100644
--- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.xtend
+++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/BindingGeneratorImpl.xtend
@@ -882,7 +882,10 @@ public class BindingGeneratorImpl implements BindingGenerator {
             } while (result == null && !(parent instanceof Module));
 
             if (result != null) {
-                if (tmpPath.size == 1) {
+                if (tmpPath.size == 1) {
+                    if (result != null && result.addedByUses) {
+                        result = findOriginal(result);
+                    }
                     return result;
                 } else {
                     var DataSchemaNode newParent = result;
@@ -890,6 +893,9 @@ public class BindingGeneratorImpl implements BindingGenerator {
                     tmpPath.remove(0);
                     for (name : tmpPath) {
                         newParent = (newParent as DataNodeContainer).getDataChildByName(name);
+                    }
+                    if (newParent != null && newParent.addedByUses) {
+                        newParent = findOriginal(newParent);
                     }
                     return newParent;
                 }