Author: stack
Date: Thu Jun 2 19:05:40 2011
New Revision: 1130740
URL: http://svn.apache.org/viewvc?rev=1130740&view=rev
Log:
HADOOP-7351 Regression: HttpServer#getWebAppsPath used to be protected so
subclasses could supply alternate webapps path but it was made private by
HADOOP-6461
Modified:
hadoop/common/branches/branch-0.22/CHANGES.txt
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/http/HttpServer.java
Modified: hadoop/common/branches/branch-0.22/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1130740&r1=1130739&r2=1130740&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Thu Jun 2 19:05:40 2011
@@ -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
Modified:
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/http/HttpServer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/http/HttpServer.java?rev=1130740&r1=1130739&r2=1130740&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/http/HttpServer.java
(original)
+++
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/http/HttpServer.java
Thu Jun 2 19:05:40 2011
@@ -459,7 +459,7 @@ public class HttpServer implements Filte
* @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
