You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2014/03/25 04:36:52 UTC
svn commit: r1581214 - in /lucene/dev/branches/lucene_solr_4_7: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java
Author: sarowe
Date: Tue Mar 25 03:36:52 2014
New Revision: 1581214
URL: http://svn.apache.org/r1581214
Log:
SOLR-5839: ZookeeperInfoServlet does not trim path properly. (merged branch_4x r1575593)
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/servlet/ZookeeperInfoServlet.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=1581214&r1=1581213&r2=1581214&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt Tue Mar 25 03:36:52 2014
@@ -105,6 +105,9 @@ Bug Fixes
* SOLR-5834: Overseer threads are only being interrupted and not closed.
(hossman, Mark Miller)
+* SOLR-5839: ZookeeperInfoServlet does not trim path properly.
+ (Furkan KAMACI via Mark Miller)
+
Other Changes
---------------------
Modified: lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java?rev=1581214&r1=1581213&r2=1581214&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java Tue Mar 25 03:36:52 2014
@@ -195,7 +195,7 @@ public final class ZookeeperInfoServlet
if (path == null) {
path = "/";
} else {
- path.trim();
+ path = path.trim();
if (path.length() == 0) {
path = "/";
}