jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thom...@apache.org
Subject svn commit: r1537084 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
Date Wed, 30 Oct 2013 13:38:59 GMT
Author: thomasm
Date: Wed Oct 30 13:38:59 2013
New Revision: 1537084

URL: http://svn.apache.org/r1537084
Log:
OAK-1106 Query engine does not deal with remapped namespaces (improved error reporting)

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java?rev=1537084&r1=1537083&r2=1537084&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
Wed Oct 30 13:38:59 2013
@@ -631,7 +631,11 @@ public class QueryImpl implements Query 
         if (namePathMapper == null) {
             return path;
         }
-        return namePathMapper.getOakPath(path);
+        String p = namePathMapper.getOakPath(path);
+        if (p == null) {
+            throw new IllegalArgumentException("Invalid path or namespace prefix: " + path);
+        }
+        return p;
     }
 
     @Override



Mime
View raw message