From commits-return-13712-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Wed Oct 3 08:26:34 2012 Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A3AD1D1EB for ; Wed, 3 Oct 2012 08:26:34 +0000 (UTC) Received: (qmail 78938 invoked by uid 500); 3 Oct 2012 08:26:34 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 78761 invoked by uid 500); 3 Oct 2012 08:26:31 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 78716 invoked by uid 99); 3 Oct 2012 08:26:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Oct 2012 08:26:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Oct 2012 08:26:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E061E23889ED; Wed, 3 Oct 2012 08:25:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1393342 - in /jackrabbit/trunk/jackrabbit-spi-commons/src: main/java/org/apache/jackrabbit/spi/commons/query/xpath/ test/java/org/apache/jackrabbit/spi/commons/query/xpath/ Date: Wed, 03 Oct 2012 08:25:42 -0000 To: commits@jackrabbit.apache.org From: schans@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121003082542.E061E23889ED@eris.apache.org> Author: schans Date: Wed Oct 3 08:25:42 2012 New Revision: 1393342 URL: http://svn.apache.org/viewvc?rev=1393342&view=rev Log: JCR-3435: Fix NPE for xpath query with child axis and star name Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/QueryFormat.java jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/xpath/QueryFormatTest.java Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/QueryFormat.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/QueryFormat.java?rev=1393342&r1=1393341&r2=1393342&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/QueryFormat.java (original) +++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/QueryFormat.java Wed Oct 3 08:25:42 2012 @@ -348,7 +348,7 @@ class QueryFormat implements QueryNodeVi PathQueryNode relPath = node.getRelativePath(); if (relPath == null) { propPath.append("."); - } else if (relPath.getNumOperands() > 0 && relPath.getPathSteps()[0].getNameTest().equals(XPathQueryBuilder.FN_POSITION_FULL)) { + } else if (relPath.getNumOperands() > 0 && XPathQueryBuilder.FN_POSITION_FULL.equals(relPath.getPathSteps()[0].getNameTest())) { propPath.append(resolver.getJCRName(XPathQueryBuilder.FN_POSITION_FULL)); } else { LocationStepQueryNode[] steps = relPath.getPathSteps(); Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java?rev=1393342&r1=1393341&r2=1393342&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java (original) +++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java Wed Oct 3 08:25:42 2012 @@ -425,8 +425,13 @@ public class XPathQueryBuilder implement } PathQueryNode relPath = tmp.getRelativePath(); LocationStepQueryNode[] steps = relPath.getPathSteps(); - - tmpRelPath.addLast(steps[steps.length-1].getNameTest()); + + Name nameTest = steps[steps.length-1].getNameTest(); + if (nameTest==null) { + // see LocationStepQueryNode javadoc on when getNameTest()==null: when it was a star (asterisk) + nameTest = RelationQueryNode.STAR_NAME_TEST; + } + tmpRelPath.addLast(nameTest); } } break; @@ -956,7 +961,7 @@ public class XPathQueryBuilder implement } if (queryNode.getType() == QueryNode.TYPE_PATH) { PathQueryNode pathNode = (PathQueryNode) queryNode; - + pathNode.addPathStep(createDerefQueryNode(node, descendant, pathNode)); } else if (queryNode.getType() == QueryNode.TYPE_RELATION) { RelationQueryNode relNode = (RelationQueryNode) queryNode; Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/xpath/QueryFormatTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/xpath/QueryFormatTest.java?rev=1393342&r1=1393341&r2=1393342&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/xpath/QueryFormatTest.java (original) +++ jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/xpath/QueryFormatTest.java Wed Oct 3 08:25:42 2012 @@ -67,6 +67,14 @@ public class QueryFormatTest extends Tes checkStatement("//element(*, foo)[foo/*/@bar = 'bla']"); } + public void testStarNameAtBeginningOfPredicate() throws Exception { + checkStatement("//element(*, foo)[*/*/@bar = 'bla']"); + } + + public void testChildStarName() throws Exception { + checkStatement("//programs//*[*/@sunday]"); + } + public void testRepSimilar() throws Exception { checkStatement("//element(*, foo)[rep:similar(foo, '/some/path')]"); }