Clean-up / simplification.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@805321 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/filters/FilterBase.java b/java/org/apache/catalina/filters/FilterBase.java
index 6a62a41..0d1c393 100644 (file)
--- a/java/org/apache/catalina/filters/FilterBase.java
+++ b/java/org/apache/catalina/filters/FilterBase.java
@@ -22,17 +22,14 @@ import java.util.Enumeration;
 import javax.servlet.Filter;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.apache.juli.logging.Log;
 import org.apache.tomcat.util.IntrospectionUtils;
 import org.apache.tomcat.util.res.StringManager;
 
 /**
- * Base class for filters that provide some utility methods. 
+ * Base class for filters that provides generic initialisation and a simple
+ * no-op destruction. 
  * 
  * @author xxd
  *
@@ -42,6 +39,8 @@ public abstract class FilterBase implements Filter {
     protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
+    protected abstract Log getLogger();
+    
     public void init(FilterConfig filterConfig) throws ServletException {
         Enumeration<String> paramNames = filterConfig.getInitParameterNames();
         while (paramNames.hasMoreElements()) {
@@ -54,38 +53,9 @@ public abstract class FilterBase implements Filter {
         }    
     }
 
-    /**
-     * Whether the request object is an HttpServletRequest or not.
-     * 
-     * @param request
-     * @return
-     */
-    protected boolean isHttpServletRequest(ServletRequest request) {
-        return request instanceof HttpServletRequest;
-    }
-
-    /**
-     * Whether the response object is an HttpServletResponse or not.
-     * 
-     * @param response
-     * @return
-     */
-    protected boolean isHttpServletResponse(ServletResponse response) {
-        return response instanceof HttpServletResponse;
+    @Override
+    public void destroy() {
+        // NOOP
     }
 
-    /**
-     * Whether the corresponding Servlet is an HttpServlet or not.
-     * 
-     * @param request
-     * @param response
-     * @return
-     */
-    protected boolean isHttpServlet(ServletRequest request,
-            ServletResponse response) {
-        return isHttpServletRequest(request) && isHttpServletResponse(response);
-    }
-
-    protected abstract Log getLogger();
-    
 }

diff --git a/java/org/apache/catalina/filters/RequestFilter.java b/java/org/apache/catalina/filters/RequestFilter.java
index ff12fd2..97f9b95 100644 (file)
--- a/java/org/apache/catalina/filters/RequestFilter.java
+++ b/java/org/apache/catalina/filters/RequestFilter.java
@@ -171,13 +171,6 @@ public abstract class RequestFilter
     // --------------------------------------------------------- Public Methods
 
 
-    /* (non-Javadoc)
-     * @see javax.servlet.Filter#destroy()
-     */
-    public void destroy() {
-        // NOOP
-    }   
-    
     /**
      * Extract the desired request property, and pass it (along with the
      * specified request and response objects) to the protected
@@ -259,7 +252,7 @@ public abstract class RequestFilter
         if (isAllowed(property)) {
             chain.doFilter(request, response);
         } else {
-            if (isHttpServletResponse(response)) {
+            if (response instanceof HttpServletResponse) {
                 ((HttpServletResponse) response)
                         .sendError(HttpServletResponse.SC_FORBIDDEN);
             } else {