Browse Source

HADOOP-7351 Regression: HttpServer#getWebAppsPath used to be protected so subclasses could supply alternate webapps path but it was made private by HADOOP-6461

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1130740 13f79535-47bb-0310-9956-ffa450edef68
Michael Stack 14 years ago
parent
commit
3ef4d9bd6e
2 changed files with 5 additions and 1 deletions
  1. 4 0
      CHANGES.txt
  2. 1 1
      src/java/org/apache/hadoop/http/HttpServer.java

+ 4 - 0
CHANGES.txt

@@ -497,6 +497,10 @@ Release 0.22.0 - Unreleased
     HADOOP-7121. Exceptions while serializing IPC call responses are not
     handled well. (todd)
 
+    HADOOP-7351  Regression: HttpServer#getWebAppsPath used to be protected
+    so subclasses could supply alternate webapps path but it was made private
+    by HADOOP-6461 (Stack)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

+ 1 - 1
src/java/org/apache/hadoop/http/HttpServer.java

@@ -459,7 +459,7 @@ public class HttpServer implements FilterContainer {
    * @return the pathname as a URL
    * @throws FileNotFoundException if 'webapps' directory cannot be found on CLASSPATH.
    */
-  private String getWebAppsPath(String appName) throws FileNotFoundException {
+  protected String getWebAppsPath(String appName) throws FileNotFoundException {
     URL url = getClass().getClassLoader().getResource("webapps/" + appName);
     if (url == null) 
       throw new FileNotFoundException("webapps/" + appName