svn commit: r1493076 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java

[alexparvulescu]

Author: alexparvulescu
Date: Fri Jun 14 13:58:02 2013
New Revision: 1493076

URL: http://svn.apache.org/r1493076
Log:
OAK-328 jcr:like(fn:name(), '%:content') should not match jcr:content
  - fixed a NPE in ComparisonImpl which made the test 
org.apache.jackrabbit.core.query.FnNameQueryTest#testSimple fail

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

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java?rev=1493076&r1=1493075&r2=1493076&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java
 Fri Jun 14 13:58:02 2013
@@ -66,7 +66,7 @@ public class ComparisonImpl extends Cons
     public Set<PropertyExistenceImpl> getPropertyExistenceConditions() {
         PropertyExistenceImpl p = operand1.getPropertyExistence();
         if (p == null) {
-            Collections.emptySet();
+            return Collections.emptySet();
         }
         return Collections.singleton(p);
     }