X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Frfc6020%2FGroupingUtils.java;fp=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Frfc6020%2FGroupingUtils.java;h=2c12b0ad92b5d0af2d4bf2c3906d7055239c7963;hb=a56a3df7cf9f00eb9af93173cf266941ffb3f847;hp=5c7954526e8ea4df4817614f9579d0e620677a30;hpb=35691e4c2baa44e60dd8a882319e9b63b3b1b43e;p=yangtools.git

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java
index 5c7954526e..2c12b0ad92 100644
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java
@@ -97,28 +97,20 @@ public final class GroupingUtils {
 
     public static QNameModule getNewQNameModule(final StatementContextBase<?, ?, ?> targetCtx,
             final StmtContext<?, ?, ?> stmtContext) {
-        if (needToCreateNewQName(stmtContext.getPublicDefinition())) {
-            if (targetCtx.isRootContext()) {
-                return targetCtx.getFromNamespace(ModuleCtxToModuleQName.class, targetCtx);
-            }
-            if (targetCtx.getPublicDefinition() == Rfc6020Mapping.AUGMENT) {
-                return targetCtx.getFromNamespace(ModuleCtxToModuleQName.class, targetCtx.getRoot());
-            }
+        if (targetCtx.isRootContext()) {
+            return targetCtx.getFromNamespace(ModuleCtxToModuleQName.class, targetCtx);
+        }
+        if (targetCtx.getPublicDefinition() == Rfc6020Mapping.AUGMENT) {
+            return targetCtx.getFromNamespace(ModuleCtxToModuleQName.class, targetCtx.getRoot());
+        }
 
-            final Object targetStmtArgument = targetCtx.getStatementArgument();
-            final Object sourceStmtArgument = stmtContext.getStatementArgument();
-            if (targetStmtArgument instanceof QName && sourceStmtArgument instanceof QName) {
-                return ((QName) targetStmtArgument).getModule();
-            } else {
-                return null;
-            }
-        } else {
-            return null;
+        final Object targetStmtArgument = targetCtx.getStatementArgument();
+        final Object sourceStmtArgument = stmtContext.getStatementArgument();
+        if (targetStmtArgument instanceof QName && sourceStmtArgument instanceof QName) {
+            return ((QName) targetStmtArgument).getModule();
         }
-    }
 
-    public static boolean needToCreateNewQName(final StatementDefinition publicDefinition) {
-        return true;
+        return null;
     }
 
     private static final Set<Rfc6020Mapping> NOCOPY_DEF_SET = ImmutableSet.of(Rfc6020Mapping.USES,