You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2016/02/08 22:20:18 UTC
lucene-solr git commit: SOLR-8621: Fix SolrIndexConfig.toMap() to use
mergePolicyFactoryInfo if present
Repository: lucene-solr
Updated Branches:
refs/heads/master 03d7f80b2 -> fe2cf2507
SOLR-8621: Fix SolrIndexConfig.toMap() to use mergePolicyFactoryInfo if present
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fe2cf250
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fe2cf250
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fe2cf250
Branch: refs/heads/master
Commit: fe2cf250796a98ff1791a504d21acb67f0a1c397
Parents: 03d7f80
Author: Shai Erera <sh...@apache.org>
Authored: Mon Feb 8 23:19:51 2016 +0200
Committer: Shai Erera <sh...@apache.org>
Committed: Mon Feb 8 23:20:13 2016 +0200
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fe2cf250/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
index cf30c56..ee16f7f 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
@@ -188,7 +188,11 @@ public class SolrIndexConfig implements MapSerializable {
"lockType", lockType,
"infoStreamEnabled", infoStream != InfoStream.NO_OUTPUT);
if(mergeSchedulerInfo != null) m.put("mergeScheduler",mergeSchedulerInfo.toMap());
- if(mergePolicyInfo != null) m.put("mergePolicy",mergePolicyInfo.toMap());
+ if (mergePolicyInfo != null) {
+ m.put("mergePolicy", mergePolicyInfo.toMap());
+ } else if (mergePolicyFactoryInfo != null) {
+ m.put("mergePolicy", mergePolicyFactoryInfo.toMap());
+ }
if(mergedSegmentWarmerInfo != null) m.put("mergedSegmentWarmer",mergedSegmentWarmerInfo.toMap());
return m;
}