Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@hbase.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1352395 -
 /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java
Date: Thu, 21 Jun 2012 02:18:25 -0000
To: commits@hbase.apache.org
From: tedyu@apache.org
Message-Id: <20120621021825.B75DD2388860@eris.apache.org>

Author: tedyu
Date: Thu Jun 21 02:18:25 2012
New Revision: 1352395

URL: http://svn.apache.org/viewvc?rev=1352395&view=rev
Log:
HBASE-6248 Jetty init may fail if directory name contains "master" (Dave Revell)


Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java?rev=1352395&r1=1352394&r2=1352395&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java Thu Jun 21 02:18:25 2012
@@ -125,8 +125,10 @@ public class InfoServer extends HttpServ
     // web applications.
     final String master = "master";
     String p = getWebAppsPath(master);
-    int index = p.lastIndexOf(master);
     // Now strip master off the end if it is present
-    return index == -1? p: p.substring(0, index);
+    if(p.endsWith(master)) {
+      return p.substring(0, p.lastIndexOf(master));
+    }
+    return p;
   }
-}
\ No newline at end of file
+}