Author: mduerig Date: Wed Aug 22 08:03:39 2012 New Revision: 1375928 URL: http://svn.apache.org/viewvc?rev=1375928&view=rev Log: OAK-268: XPathQueryEvaluator generates incorrect XPath query Thanks Chetan Mehrotra for the patch
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/query/XPathQueryEvaluator.java Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/query/XPathQueryEvaluator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/query/XPathQueryEvaluator.java?rev=1375928&r1=1375927&r2=1375928&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/query/XPathQueryEvaluator.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/query/XPathQueryEvaluator.java Wed Aug 22 08:03:39 2012 @@ -17,6 +17,7 @@ package org.apache.jackrabbit.oak.jcr.security.user.query; import java.util.Iterator; + import javax.annotation.Nonnull; import javax.jcr.Node; import javax.jcr.PropertyType; @@ -131,13 +132,13 @@ public class XPathQueryEvaluator impleme @Override public void visit(Condition.Node condition) throws RepositoryException { xPath.append('(') - .append("jcr:like(") + .append("jcr:like(@") .append(namePathMapper.getJcrName(UserConstants.REP_PRINCIPAL_NAME)) .append(",'") .append(condition.getPattern()) .append("')") .append(" or ") - .append("jcr:like(fn:name(.),'") + .append("jcr:like(fn:name(),'") .append(escape(condition.getPattern())) .append("')") .append(')');