You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/03/18 00:35:44 UTC
svn commit: r1578662 - in /lucene/dev/branches/lucene_solr_4_7: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Author: markrmiller
Date: Mon Mar 17 23:35:44 2014
New Revision: 1578662
URL: http://svn.apache.org/r1578662
Log:
SOLR-5867: OverseerCollectionProcessor isn't properly generating https urls in some cases.
Modified:
lucene/dev/branches/lucene_solr_4_7/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_7/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Modified: lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt?rev=1578662&r1=1578661&r2=1578662&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt Mon Mar 17 23:35:44 2014
@@ -51,6 +51,9 @@ Bug Fixes
* SOLR-5870: Admin UI - Reload on Core Admin doesn't show errors (steffkes)
+* SOLR-5867: OverseerCollectionProcessor isn't properly generating https urls in some
+ cases. (Steve Davids via shalin)
+
================== 4.7.0 ==================
Versions of Major Components
Modified: lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1578662&r1=1578661&r2=1578662&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Mon Mar 17 23:35:44 2014
@@ -344,7 +344,7 @@ public class OverseerCollectionProcessor
params.set("qt", adminPath);
ShardRequest sreq = new ShardRequest();
sreq.purpose = 1;
- String replica = nodeName.replaceFirst("_", "/");
+ String replica = zkStateReader.getBaseUrlForNodeName(nodeName);
sreq.shards = new String[]{replica};
sreq.actualShards = sreq.shards;
sreq.params = params;