Author: tommaso
Date: Thu Feb 19 15:01:26 2015
New Revision: 1660905
URL: http://svn.apache.org/r1660905
Log:
OAK-2536 - fixed wrong used.properties initialization
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java?rev=1660905&r1=1660904&r2=1660905&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
Thu Feb 19 15:01:26 2015
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
@@ -90,8 +91,7 @@ public class OakSolrConfigurationProvide
unbounded = PropertyUnbounded.ARRAY)
private static final String IGNORED_PROPERTIES = "ignored.properties";
- @Property(label = "used properties",
- unbounded = PropertyUnbounded.ARRAY)
+ @Property(value = {}, label = "used properties", unbounded =
PropertyUnbounded.ARRAY)
private static final String USED_PROPERTIES = "used.properties";
@Property(value = SolrServerConfigurationDefaults.TYPE_MAPPINGS,
cardinality = 13, description =
@@ -247,7 +247,11 @@ public class OakSolrConfigurationProvide
@Nonnull
@Override
public Collection<String> getIgnoredProperties() {
- return Arrays.asList(ignoredProperties);
+ if (usedProperties != null && usedProperties.length > 0) {
+ return Arrays.asList(usedProperties);
+ } else {
+ return Collections.emptyList();
+ }
}
@Nonnull
