svn commit: r1174969 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/util/InfoServer.java

[stack]

Author: stack
Date: Fri Sep 23 19:36:12 2011
New Revision: 1174969

URL: http://svn.apache.org/viewvc?rev=1174969&view=rev
Log:
HBASE-4468 Wrong resource name in an error massage: webapps instead of 
hbase-webapps

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1174969&r1=1174968&r2=1174969&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Fri Sep 23 19:36:12 2011
@@ -301,6 +301,8 @@ Release 0.92.0 - Unreleased
                znode version mismatch (Ramkrishna)
    HBASE-4446  Rolling restart RSs scenario, regions could stay in OPENING 
state
                (Ming Ma)
+   HBASE-4468  Wrong resource name in an error massage: webapps instead of
+               hbase-webapps (nkeywal)
 
   TESTS
    HBASE-4450  test for number of blocks read: to serve as baseline for 
expected

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java?rev=1174969&r1=1174968&r2=1174969&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java 
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java Fri 
Sep 23 19:36:12 2011
@@ -102,10 +102,10 @@ public class InfoServer extends HttpServ
    */
   protected String getWebAppsPath(String appName) throws FileNotFoundException 
{
     // Copied from the super-class.
-    URL url = getClass().getClassLoader().getResource("hbase-webapps/" + 
appName);
+    String resourceName = "hbase-webapps/" + appName;
+    URL url = getClass().getClassLoader().getResource(resourceName);
     if (url == null)
-      throw new FileNotFoundException("webapps/" + appName
-          + " not found in CLASSPATH");
+      throw new FileNotFoundException(resourceName + " not found in 
CLASSPATH");
     String urlString = url.toString();
     return urlString.substring(0, urlString.lastIndexOf('/'));
   }