Trim deref() argument

When we are evaluating a deref() call we need to make sure we
strip the string completely, otherwise we would arrive at incorrect
path.

JIRA: YANGTOOLS-1050
Change-Id: I36b45677243bcb8ccbf91f8813f082dbddee2a6a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 2e7e6dc6ee82447a286e4df18415de4bff6c2b4e)

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java
index 00f25a7b6c43c18f54dc63cf21c80e4aa6d1316e..b8ffe379da7b5b37211de4c13a8f7a741a43796f 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java
@@ -635,7 +635,7 @@ public final class SchemaContextUtil {
         final int paren = xpath.indexOf(')', 6);
         checkArgument(paren != -1, "Cannot find matching parentheses in %s", xpath);
 
-        final String derefArg = xpath.substring(6, paren);
+        final String derefArg = SPACE.trimFrom(xpath.substring(6, paren));
         // Look up the node which we need to reference
         final SchemaNode derefTarget = findTargetNode(context, resolveRelativePath(context, module, actualSchemaNode,
             doSplitXPath(derefArg)));