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...@locus.apache.org on 2000/07/12 01:48:40 UTC
cvs commit: jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core LocalStrings.properties StandardWrapper.java
craigmcc 00/07/11 16:48:39
Modified: proposals/catalina/src/share/org/apache/tomcat/core
LocalStrings.properties StandardWrapper.java
Log:
Change the servlet wrapper so that exceptions thrown by Servlet.init() are
merely logged, instead of being fatal to Catalina startup.
Revision Changes Path
1.18 +2 -0 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/LocalStrings.properties,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- LocalStrings.properties 2000/05/22 20:11:11 1.17
+++ LocalStrings.properties 2000/07/11 23:48:36 1.18
@@ -55,6 +55,7 @@
standardWrapper.initException=Servlet.init() for servlet {0} threw exception
standardWrapper.instantiate=Error instantiating servlet class {0}
standardWrapper.isUnavailable=Servlet {0} is currently unavailable
+standardWrapper.loadException=Servlet {0} threw load() exception
standardWrapper.missingClass=Wrapper cannot find servlet class {0} or a class it depends on
standardWrapper.missingLoader=Wrapper cannot find Loader for servlet {0}
standardWrapper.notChild=Wrapper container may not have child containers
@@ -65,6 +66,7 @@
standardWrapper.statusHeader=HTTP Status {0} - {1}
standardWrapper.statusTitle=Tomcat Error Report
standardWrapper.unavailable=Marking servlet {0} as unavailable
+standardWrapper.unloadException=Servlet {0} threw unload() exception
http.100=The client may continue ({0}).
http.101=The server is switching protocols according to the "Upgrade" header ({0}).
#http.201=The request succeeded and a new resource ({0}) has been created on the server.
1.15 +6 -6 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapper.java
Index: StandardWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapper.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StandardWrapper.java 2000/05/22 20:11:15 1.14
+++ StandardWrapper.java 2000/07/11 23:48:36 1.15
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapper.java,v 1.14 2000/05/22 20:11:15 craigmcc Exp $
- * $Revision: 1.14 $
- * $Date: 2000/05/22 20:11:15 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/core/StandardWrapper.java,v 1.15 2000/07/11 23:48:36 craigmcc Exp $
+ * $Revision: 1.15 $
+ * $Date: 2000/07/11 23:48:36 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
* make them efficient are counter-productive.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.14 $ $Date: 2000/05/22 20:11:15 $
+ * @version $Revision: 1.15 $ $Date: 2000/07/11 23:48:36 $
*/
public final class StandardWrapper
@@ -925,7 +925,7 @@
try {
load();
} catch (ServletException e) {
- throw new LifecycleException("start: " + e);
+ log(sm.getString("standardWrapper.loadException", getName()), e);
}
}
@@ -943,7 +943,7 @@
try {
unload();
} catch (ServletException e) {
- throw new LifecycleException("stop: " + e);
+ log(sm.getString("standardWrapper.unloadException", getName()), e);
}
// Shut down this component