You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2015/03/11 16:13:06 UTC
svn commit: r1665897 -
/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
Author: tommaso
Date: Wed Mar 11 15:13:06 2015
New Revision: 1665897
URL: http://svn.apache.org/r1665897
Log:
OAK-2607 - fixed usage of usedProperties and ignoredProperties
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=1665897&r1=1665896&r2=1665897&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 Wed Mar 11 15:13:06 2015
@@ -247,8 +247,8 @@ public class OakSolrConfigurationProvide
@Nonnull
@Override
public Collection<String> getIgnoredProperties() {
- if (usedProperties != null && usedProperties.length > 0) {
- return Arrays.asList(usedProperties);
+ if (ignoredProperties != null && ignoredProperties.length > 0) {
+ return Arrays.asList(ignoredProperties);
} else {
return Collections.emptyList();
}
@@ -257,7 +257,11 @@ public class OakSolrConfigurationProvide
@Nonnull
@Override
public Collection<String> getUsedProperties() {
- return Arrays.asList(usedProperties);
+ if (usedProperties != null && usedProperties.length > 0) {
+ return Arrays.asList(usedProperties);
+ } else {
+ return Collections.emptyList();
+ }
}
};
}