| commit | 48e725ca1931e972fd6bde3902db85b9769e7011 | [log] [tgz] |
|---|---|---|
| author | Claus Köll <ckoell@apache.org> | Tue Jul 09 11:56:44 2019 +0000 |
| committer | Claus Köll <ckoell@apache.org> | Tue Jul 09 11:56:44 2019 +0000 |
| tree | 8bf9a06dcacac1b5477c4a4d2083143970bb934c | |
| parent | cd7582eb9bc6852141d0b7a7eb30088e4c5133bf [diff] |
JCR-4455 condition index-rule handling more broken after JCR-4339 git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1862805 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java index 00bfe9b..4d15a18 100644 --- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java +++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java
@@ -393,7 +393,7 @@ 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;
diff --git a/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/query/lucene/indexing_config6.xml b/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/query/lucene/indexing_config6.xml index f8c2b37..025bc0c 100644 --- a/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/query/lucene/indexing_config6.xml +++ b/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/query/lucene/indexing_config6.xml
@@ -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>