Merge pull request #1615 from mbenson/expanded-selector-query-custom-ns

MODE-2649 Support non-built-in namespaces in query selectors
ModeShape · Dec 14, 2016 · 50776e9 · 50776e9
2 parents e0d96e3 + bd5d253
commit 50776e9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/modeshape-jcr/src/main/java/org/modeshape/jcr/query/model/SelectorName.java b/modeshape-jcr/src/main/java/org/modeshape/jcr/query/model/SelectorName.java
@@ -55,7 +55,10 @@ public String name() {
      * @return a {@link org.modeshape.jcr.query.model.SelectorName} instance for which the name is always in qualified form; never null
      */
     public SelectorName qualifiedForm(NameFactory nameFactory) {
-        return expandedForm ? new SelectorName(nameFactory.create(this.name).getString()) : this;
+        if (expandedForm) {
+            return new SelectorName(nameFactory.create(this.name).getString(nameFactory.getNamespaceRegistry()));
+        }
+        return this;
     }
 
     @Override