X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-spi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fspi%2Fmeta%2FStmtContextUtils.java;h=5f88a708ddfc778e7a4df2d1fa09090527bc0fc4;hb=4e23de902b25ea5cdd8e0e21525f51a30adc61d1;hp=cd91b51cc29bff6cd87f44b3df9f78b2b4bdbcaa;hpb=36e43cc9eabc08aad04f642aa90e7fec8427f5e1;p=yangtools.git

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
index cd91b51cc2..5f88a708dd 100644
--- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
+++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
@@ -544,19 +544,12 @@ public final class StmtContextUtils {
         final QNameModule qNameModule = root.getFromNamespace(ModuleCtxToModuleQName.class, root);
         if (qNameModule != null) {
             // creates SourceIdentifier for a module
-            if (qNameModule.getFormattedRevision() == null) {
-                return RevisionSourceIdentifier.create((String) root.getStatementArgument());
-            }
-
-            return RevisionSourceIdentifier.create((String) root.getStatementArgument(),
-                qNameModule.getFormattedRevision());
+            return RevisionSourceIdentifier.create((String) root.getStatementArgument(), qNameModule.getRevision());
         }
 
         // creates SourceIdentifier for a submodule
         final Optional<Revision> revision = getLatestRevision(root.declaredSubstatements());
-        return revision.isPresent()
-                ? RevisionSourceIdentifier.create((String) root.getStatementArgument(), revision.get().toString())
-                        : RevisionSourceIdentifier.create((String) root.getStatementArgument());
+        return RevisionSourceIdentifier.create((String) root.getStatementArgument(), revision);
     }
 
     public static Optional<Revision> getLatestRevision(final Iterable<? extends StmtContext<?, ?, ?>> subStmts) {