You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2012/05/25 23:43:54 UTC
svn commit: r1342817 - in /lucene/dev/branches/lucene_solr_3_6/solr:
CHANGES.txt core/src/java/org/apache/solr/handler/ReplicationHandler.java
Author: janhoy
Date: Fri May 25 21:43:54 2012
New Revision: 1342817
URL: http://svn.apache.org/viewvc?rev=1342817&view=rev
Log:
SOLR-3489: Config file replication less error prone (backport from trunk)
Modified:
lucene/dev/branches/lucene_solr_3_6/solr/CHANGES.txt
lucene/dev/branches/lucene_solr_3_6/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
Modified: lucene/dev/branches/lucene_solr_3_6/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/solr/CHANGES.txt?rev=1342817&r1=1342816&r2=1342817&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_3_6/solr/CHANGES.txt Fri May 25 21:43:54 2012
@@ -39,6 +39,8 @@ Bug Fixes:
* SOLR-3454: Exception when using result grouping with main=true and using
wt=javabin. (Ludovic Boutros, Martijn van Groningen)
+* SOLR-3489: Config file replication less error prone (Jochen Just via janhoy)
+
================== 3.6.0 ==================
More information about this release, including any errata related to the
release notes, upgrade instructions, or other changes may be found online at:
Modified: lucene/dev/branches/lucene_solr_3_6/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=1342817&r1=1342816&r2=1342817&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java (original)
+++ lucene/dev/branches/lucene_solr_3_6/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java Fri May 25 21:43:54 2012
@@ -813,8 +813,10 @@ public class ReplicationHandler extends
if (includeConfFiles != null && includeConfFiles.trim().length() > 0) {
List<String> files = Arrays.asList(includeConfFiles.split(","));
for (String file : files) {
- if (file.trim().length() == 0) continue;
- String[] strs = file.split(":");
+ // allow comma-separation inculding spaces
+ String trimmedFile = file.trim();
+ if (trimmedFile.length() == 0) continue;
+ String[] strs = trimmedFile.split(":");
// if there is an alias add it or it is null
confFileNameAlias.add(strs[0], strs.length > 1 ? strs[1] : null);
}