From: Robert Varga <rovarga@cisco.com>
Date: Wed, 13 Aug 2014 12:49:59 +0000 (+0200)
Subject: Fix conflict on Object definition
X-Git-Tag: release/beryllium~389
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=11f470b95e79ff7acd87c1a27141a02f466fc500;p=mdsal.git

Fix conflict on Object definition

The use of Object (in the java.lang sense) is not working with models
which contain a 'container object' or similar. The fix is to not use a
temporary variable.

Change-Id: I98b3bde9a04d5f33a51a0add107829ad92d35907
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderTemplate.xtend b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderTemplate.xtend
index 74a5ef3793..96e3af8d96 100644
--- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderTemplate.xtend
+++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BuilderTemplate.xtend
@@ -691,8 +691,7 @@ class BuilderTemplate extends BaseTemplate {
                     } else {
                         // Hard case: compare our augments with presence there...
                         for («Map.importedName».Entry<«Class.importedName»<? extends «augmentField.returnType.importedName»>, «augmentField.returnType.importedName»> e : «augmentField.name».entrySet()) {
-                            final Object oa = other.getAugmentation(e.getKey());
-                            if (!e.getValue().equals(oa)) {
+                            if (!e.getValue().equals(other.getAugmentation(e.getKey()))) {
                                 return false;
                             }
                         }