jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cko...@apache.org
Subject svn commit: r1862805 - in /jackrabbit/trunk/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java test/resources/org/apache/jackrabbit/core/query/lucene/indexing_config6.xml
Date Tue, 09 Jul 2019 11:56:44 GMT
Author: ckoell
Date: Tue Jul  9 11:56:44 2019
New Revision: 1862805

URL: http://svn.apache.org/viewvc?rev=1862805&view=rev
Log:
JCR-4455 condition index-rule handling more broken after JCR-4339

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/query/lucene/indexing_config6.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=1862805&r1=1862804&r2=1862805&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
Tue Jul  9 11:56:44 2019
@@ -393,7 +393,7 @@ public class IndexingConfigurationImpl
         if (rules != null) {
             for (IndexingRule rule : rules) {
                 if (rule.appliesToNodeType(state)) {
-                    if (!rule.containsCondition()) {
+                    if (!rule.containsCondition() && matchingNodeTypeRule == null)
{
                         matchingNodeTypeRule = rule;
                     } else if (rule.appliesToCondition(state)) {
                         return rule; 

Modified: jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/query/lucene/indexing_config6.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/query/lucene/indexing_config6.xml?rev=1862805&r1=1862804&r2=1862805&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/query/lucene/indexing_config6.xml
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/query/lucene/indexing_config6.xml
Tue Jul  9 11:56:44 2019
@@ -23,6 +23,10 @@
 		<property>other</property>
 	</index-rule>
 
+ 	<index-rule nodeType="nt:unstructured">
+		<property>other_</property>
+	</index-rule>
+
 	<index-rule nodeType="nt:unstructured" condition="@foo = 'high'">
 		<property>foo</property>
 	</index-rule>



Mime
View raw message