You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@apache.org on 2001/03/17 01:39:32 UTC
cvs commit: jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters ExampleFilter.java RequestDumperFilter.java
craigmcc 01/03/16 16:39:32
Modified: catalina/src/share/org/apache/catalina/core
ApplicationFilterConfig.java
webapps/examples/WEB-INF/classes/filters ExampleFilter.java
RequestDumperFilter.java
Log:
Filter.init() can now throw ServletException to indicate an initialization
error, which will cause the filter instance to not be put into service.
Revision Changes Path
1.5 +9 -3 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java
Index: ApplicationFilterConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApplicationFilterConfig.java 2001/03/17 00:28:02 1.4
+++ ApplicationFilterConfig.java 2001/03/17 00:39:28 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java,v 1.4 2001/03/17 00:28:02 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/03/17 00:28:02 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java,v 1.5 2001/03/17 00:39:28 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/03/17 00:39:28 $
*
* ====================================================================
*
@@ -72,6 +72,7 @@
import javax.servlet.Filter;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
import org.apache.catalina.Context;
import org.apache.catalina.deploy.FilterDef;
import org.apache.catalina.util.Enumerator;
@@ -83,7 +84,7 @@
* is first started.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/03/17 00:28:02 $
+ * @version $Revision: 1.5 $ $Date: 2001/03/17 00:39:28 $
*/
final class ApplicationFilterConfig implements FilterConfig {
@@ -107,10 +108,12 @@
* publicly instantiated
* @exception InstantiationException if an exception occurs while
* instantiating the filter object
+ * @exception ServletException if thrown by the filter's init() method
*/
public ApplicationFilterConfig(Context context, FilterDef filterDef)
throws ClassCastException, ClassNotFoundException,
- IllegalAccessException, InstantiationException {
+ IllegalAccessException, InstantiationException,
+ ServletException {
super();
this.context = context;
@@ -225,9 +228,10 @@
* publicly instantiated
* @exception InstantiationException if an exception occurs while
* instantiating the filter object
+ * @exception ServletException if thrown by the filter's init() method
*/
Filter getFilter() throws ClassCastException, ClassNotFoundException,
- IllegalAccessException, InstantiationException {
+ IllegalAccessException, InstantiationException, ServletException {
// Return the existing filter instance, if any
if (this.filter != null)
@@ -286,10 +290,12 @@
* publicly instantiated
* @exception InstantiationException if an exception occurs while
* instantiating the filter object
+ * @exception ServletException if thrown by the filter's init() method
*/
void setFilterDef(FilterDef filterDef)
throws ClassCastException, ClassNotFoundException,
- IllegalAccessException, InstantiationException {
+ IllegalAccessException, InstantiationException,
+ ServletException {
this.filterDef = filterDef;
if (filterDef == null) {
1.4 +1 -1 jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
Index: ExampleFilter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExampleFilter.java 2001/03/17 00:28:07 1.3
+++ ExampleFilter.java 2001/03/17 00:39:30 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java,v 1.3 2001/03/17 00:28:07 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/03/17 00:28:07 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java,v 1.4 2001/03/17 00:39:30 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/03/17 00:39:30 $
*
* ====================================================================
*
@@ -89,7 +89,7 @@
* </ul>
*
* @author Craig McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/03/17 00:28:07 $
+ * @version $Revision: 1.4 $ $Date: 2001/03/17 00:39:30 $
*/
public final class ExampleFilter implements Filter {
@@ -160,7 +160,7 @@
*
* @param filterConfig The filter configuration object
*/
- public void init(FilterConfig filterConfig) {
+ public void init(FilterConfig filterConfig) throws ServletException {
this.filterConfig = filterConfig;
this.attribute = filterConfig.getInitParameter("attribute");
1.4 +1 -1 jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java
Index: RequestDumperFilter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RequestDumperFilter.java 2001/03/17 00:28:08 1.3
+++ RequestDumperFilter.java 2001/03/17 00:39:30 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java,v 1.3 2001/03/17 00:28:08 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/03/17 00:28:08 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java,v 1.4 2001/03/17 00:39:30 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/03/17 00:39:30 $
*
* ====================================================================
*
@@ -89,7 +89,7 @@
* to assist in debugging problems.
*
* @author Craig McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/03/17 00:28:08 $
+ * @version $Revision: 1.4 $ $Date: 2001/03/17 00:39:30 $
*/
public final class RequestDumperFilter implements Filter {
@@ -219,7 +219,7 @@
*
* @param filterConfig The filter configuration object
*/
- public void init(FilterConfig filterConfig) {
+ public void init(FilterConfig filterConfig) throws ServletException {
this.filterConfig = filterConfig;