jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexparvule...@apache.org
Subject svn commit: r1413522 - in /jackrabbit/oak/trunk/oak-jcr: pom.xml src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java
Date Mon, 26 Nov 2012 09:18:05 GMT
Author: alexparvulescu
Date: Mon Nov 26 09:18:04 2012
New Revision: 1413522

URL: http://svn.apache.org/viewvc?rev=1413522&view=rev
Log:
OAK-472 NPE on tck query test DescendantNodeJoinConditionTest

Modified:
    jackrabbit/oak/trunk/oak-jcr/pom.xml
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java

Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1413522&r1=1413521&r2=1413522&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Mon Nov 26 09:18:04 2012
@@ -209,12 +209,8 @@
       org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoinSNS
       org.apache.jackrabbit.test.api.query.qom.ColumnTest#testExpandColumnsForNodeType
       org.apache.jackrabbit.test.api.query.qom.SelectorTest#testUnknownNodeType
-      org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testInnerJoin
       org.apache.jackrabbit.test.api.query.qom.NodeNameTest#testReferenceLiteral
       org.apache.jackrabbit.test.api.query.qom.NodeNameTest#testWeakReferenceLiteral
-      org.apache.jackrabbit.test.api.query.qom.ChildNodeJoinConditionTest#testRightOuterJoin
-      org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testRightOuterJoin
-      org.apache.jackrabbit.test.api.query.qom.DescendantNodeJoinConditionTest#testLeftOuterJoin
       org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testInnerJoin
       org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testRightOuterJoin
       org.apache.jackrabbit.test.api.query.qom.SameNodeJoinConditionTest#testLeftOuterJoin

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java?rev=1413522&r1=1413521&r2=1413522&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java
Mon Nov 26 09:18:04 2012
@@ -154,11 +154,17 @@ public class QueryResultImpl implements 
 
     @CheckForNull
     NodeImpl getNode(String path) {
+        if (path == null) {
+            return null;
+        }
         NodeDelegate d = sessionDelegate.getNode(path);
         return d == null ? null : new NodeImpl(d);
     }
 
     String getLocalPath(String path) {
+        if (path == null) {
+            return null;
+        }
         return PathUtils.concat("/", PathUtils.relativize(pathFilter, path));
     }
 



Mime
View raw message