Author: markt
Date: Tue Aug 18 08:29:25 2009
New Revision: 805321
URL: http://svn.apache.org/viewvc?rev=805321&view=rev
Log:
Clean-up / simplification.
Modified:
tomcat/trunk/java/org/apache/catalina/filters/FilterBase.java
tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java
Modified: tomcat/trunk/java/org/apache/catalina/filters/FilterBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/FilterBase.java?rev=805321&r1=805320&r2=805321&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/FilterBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/FilterBase.java Tue Aug 18
08:29:25 2009
@@ -22,17 +22,14 @@
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 @@
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 @@
}
}
- /**
- * 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();
-
}
Modified: tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java?rev=805321&r1=805320&r2=805321&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java Tue Aug 18
08:29:25 2009
@@ -171,13 +171,6 @@
// --------------------------------------------------------- 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 @@
if (isAllowed(property)) {
chain.doFilter(request, response);
} else {
- if (isHttpServletResponse(response)) {
+ if (response instanceof HttpServletResponse) {
((HttpServletResponse) response)
.sendError(HttpServletResponse.SC_FORBIDDEN);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
