svn commit: r1174972 - in /hbase/branches/0.92: CHANGES.txt src/main/java/org/apache/hadoop/hbase/util/InfoServer.java

[stack]

Author: stack
Date: Fri Sep 23 19:37:18 2011
New Revision: 1174972

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

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

Modified: hbase/branches/0.92/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1174972&r1=1174971&r2=1174972&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Fri Sep 23 19:37:18 2011
@@ -1,6 +1,6 @@
 HBase Change Log
 
-Release 0.91.0 - Unreleased
+Release 0.92.0 - Unreleased
   INCOMPATIBLE CHANGES
    HBASE-2002  Coprocessors: Client side support; Support RPC interface
                changes at runtime (Gary Helmling via Andrew Purtell)
@@ -296,7 +296,9 @@ Release 0.91.0 - Unreleased
    HBASE-4452  Possibility of RS opening a region though tickleOpening fails 
due to
                znode version mismatch (Ramkrishna)
    HBASE-4446  Rolling restart RSs scenario, regions could stay in OPENING 
state
-               (Ming Ma)
+               (Ming Ma) 
+   HBASE-4468  Wrong resource name in an error massage: webapps instead of
+               hbase-webapps (nkeywal)
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  

Modified: 
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java?rev=1174972&r1=1174971&r2=1174972&view=diff
==============================================================================
--- 
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java 
(original)
+++ 
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java 
Fri Sep 23 19:37:18 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('/'));
   }