浏览代码

commit c2e202a4f73e29ea905c8394dee7db99612fffc5
Author: Jakob Homan <jhoman@yahoo-inc.com>
Date: Mon Feb 1 21:26:52 2010 -0800

HADOOP-6337 from https://issues.apache.org/jira/secure/attachment/12434503/HADOOP-6337-Y.patch

+++ b/YAHOO-CHANGES.txt
+ HADOOP-6337. Update FilterInitializer class to be more visible
+ and take a conf for further development. (jhoman)
+


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-patches@1077140 13f79535-47bb-0310-9956-ffa450edef68

Owen O'Malley 14 年之前
父节点
当前提交
647b4a55c1

+ 5 - 2
src/core/org/apache/hadoop/http/FilterInitializer.java

@@ -17,6 +17,8 @@
  */
  */
 package org.apache.hadoop.http;
 package org.apache.hadoop.http;
 
 
+import org.apache.hadoop.conf.Configuration;
+
 /**
 /**
  * Initialize a javax.servlet.Filter. 
  * Initialize a javax.servlet.Filter. 
  */
  */
@@ -24,6 +26,7 @@ public abstract class FilterInitializer {
   /**
   /**
    * Initialize a Filter to a FilterContainer.
    * Initialize a Filter to a FilterContainer.
    * @param container The filter container
    * @param container The filter container
+   * @param conf Configuration for run-time parameters
    */
    */
-  abstract void initFilter(FilterContainer container);
-}
+  abstract void initFilter(FilterContainer container, Configuration conf);
+}

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

@@ -127,7 +127,7 @@ public class HttpServer implements FilterContainer {
     final FilterInitializer[] initializers = getFilterInitializers(conf); 
     final FilterInitializer[] initializers = getFilterInitializers(conf); 
     if (initializers != null) {
     if (initializers != null) {
       for(FilterInitializer c : initializers) {
       for(FilterInitializer c : initializers) {
-        c.initFilter(this);
+        c.initFilter(this, conf);
       }
       }
     }
     }
     addDefaultServlets();
     addDefaultServlets();

+ 1 - 1
src/test/org/apache/hadoop/http/TestGlobalFilter.java

@@ -68,7 +68,7 @@ public class TestGlobalFilter extends junit.framework.TestCase {
     static public class Initializer extends FilterInitializer {
     static public class Initializer extends FilterInitializer {
       public Initializer() {}
       public Initializer() {}
 
 
-      void initFilter(FilterContainer container) {
+      public void initFilter(FilterContainer container, Configuration conf) {
         container.addGlobalFilter("recording", RecordingFilter.class.getName(), null);
         container.addGlobalFilter("recording", RecordingFilter.class.getName(), null);
       }
       }
     }
     }

+ 1 - 1
src/test/org/apache/hadoop/http/TestServletFilter.java

@@ -66,7 +66,7 @@ public class TestServletFilter extends junit.framework.TestCase {
     static public class Initializer extends FilterInitializer {
     static public class Initializer extends FilterInitializer {
       public Initializer() {}
       public Initializer() {}
 
 
-      void initFilter(FilterContainer container) {
+      public void initFilter(FilterContainer container, Configuration conf) {
         container.addFilter("simple", SimpleFilter.class.getName(), null);
         container.addFilter("simple", SimpleFilter.class.getName(), null);
       }
       }
     }
     }