jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r926354 - in /jackrabbit/trunk/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java test/repository/workspaces/indexing-test/indexing-configuration.xml
Date Mon, 22 Mar 2010 21:37:40 GMT
Author: mreutegg
Date: Mon Mar 22 21:37:40 2010
New Revision: 926354

URL: http://svn.apache.org/viewvc?rev=926354&view=rev
Log:
JCR-2580: NullPointerException when using ancestor axis in indexing configuration

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java
    jackrabbit/trunk/jackrabbit-core/src/test/repository/workspaces/indexing-test/indexing-configuration.xml

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java?rev=926354&r1=926353&r2=926354&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java
Mon Mar 22 21:37:40 2010
@@ -950,7 +950,7 @@ public class IndexingConfigurationImpl
                 try {
                     nodeStates = new Iterator() {
 
-                        private NodeState next =
+                        private NodeState next = context.getParentId() == null ? null :
                                 (NodeState) ism.getItemState(context.getParentId());
 
                         public void remove() {

Modified: jackrabbit/trunk/jackrabbit-core/src/test/repository/workspaces/indexing-test/indexing-configuration.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/repository/workspaces/indexing-test/indexing-configuration.xml?rev=926354&r1=926353&r2=926354&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/repository/workspaces/indexing-test/indexing-configuration.xml
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/repository/workspaces/indexing-test/indexing-configuration.xml
Mon Mar 22 21:37:40 2010
@@ -37,6 +37,11 @@
         <property>text</property>
     </index-rule>
 
+    <index-rule nodeType="nt:unstructured"
+                condition="ancestor::*/@rule = 'ancestor-axis'">
+      <property>Text</property>
+    </index-rule>
+
     <index-rule nodeType="nt:hierarchyNode">
         <!-- do not index any properties -->
     </index-rule>



Mime
View raw message