jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject svn commit: r1221579 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java
Date Wed, 21 Dec 2011 02:58:03 GMT
Author: dbrosius
Date: Wed Dec 21 02:58:03 2011
New Revision: 1221579

URL: http://svn.apache.org/viewvc?rev=1221579&view=rev
Log:
step is statically a LocationStepQueryNode here, so change test for what is really of interest
- null or not

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java?rev=1221579&r1=1221578&r2=1221579&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java
Wed Dec 21 02:58:03 2011
@@ -938,7 +938,7 @@ public class LuceneQueryBuilder implemen
                         if (steps.length == 2) {
                             selectParent = false;
                         }
-                    } else if (step instanceof LocationStepQueryNode) {
+                    } else if (step != null) {
                         // join name test with property query if there is one
                         if (name != null) {
                             if (!name.equals(PARENT_ELEMENT_NAME)) {
@@ -982,7 +982,7 @@ public class LuceneQueryBuilder implemen
                                                indexFormatVersion,
                                                nsMappings);
                 } else {
-                    if (step instanceof LocationStepQueryNode) {
+                    if (step != null) {
                         query = new ParentAxisQuery(query, name, indexFormatVersion, nsMappings);
                     } else {
                         throw new UnsupportedOperationException();



Mime
View raw message