[ONOS-4890/4891] Sub-module variable reference using self prefix
Change-Id: Idaa58e30f7742a54d5198887353934a5d9494631
diff --git a/plugin/src/main/java/org/onosproject/yangutils/linker/impl/YangResolutionInfoImpl.java b/plugin/src/main/java/org/onosproject/yangutils/linker/impl/YangResolutionInfoImpl.java
index 00fb699..8f7a08a 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/linker/impl/YangResolutionInfoImpl.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/linker/impl/YangResolutionInfoImpl.java
@@ -21,7 +21,6 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Stack;
-
import org.onosproject.yangutils.datamodel.Resolvable;
import org.onosproject.yangutils.datamodel.ResolvableType;
import org.onosproject.yangutils.datamodel.TraversalType;
@@ -484,10 +483,10 @@
}
/*
- * In case prefix is not present it's a candidate for inter-file
+ * In case prefix is not present or it's self prefix it's a candidate for inter-file
* resolution via include list.
*/
- if (getRefPrefix() == null) {
+ if (getRefPrefix() == null || getRefPrefix().contentEquals(getCurReferenceResolver().getPrefix())) {
((Resolvable) getCurrentEntityToResolveFromStack()).setResolvableStatus(INTRA_FILE_RESOLVED);
}
}
@@ -525,8 +524,11 @@
return;
}
- //In case prefix is not present it's a candidate for inter-file resolution via include list.
- if (getRefPrefix() == null) {
+ /*
+ * In case prefix is not present or it's self prefix it's a candidate for inter-file
+ * resolution via include list.
+ */
+ if (getRefPrefix() == null || getRefPrefix().contentEquals(getCurReferenceResolver().getPrefix())) {
((Resolvable) getCurrentEntityToResolveFromStack()).setResolvableStatus(INTRA_FILE_RESOLVED);
}
}
@@ -579,10 +581,10 @@
}
/*
- * In case prefix is not present it's a candidate for inter-file
+ * In case prefix is not present or it's self prefix it's a candidate for inter-file
* resolution via include list.
*/
- if (getRefPrefix() == null) {
+ if (getRefPrefix() == null || getRefPrefix().contentEquals(getCurReferenceResolver().getPrefix())) {
((Resolvable) getCurrentEntityToResolveFromStack()).setResolvableStatus(INTRA_FILE_RESOLVED);
}
}