craigmcc 01/03/30 15:24:05 Modified: catalina/src/share/org/apache/catalina/core LocalStrings.properties StandardContext.java Log: Correctly assume that reload will be successful unless an error is encountered. Revision Changes Path 1.28 +2 -0 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/LocalStrings.properties Index: LocalStrings.properties =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/LocalStrings.properties,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- LocalStrings.properties 2001/03/30 22:41:13 1.27 +++ LocalStrings.properties 2001/03/30 23:24:04 1.28 @@ -33,8 +33,10 @@ standardContext.filterMap.name=Filter mapping specifies an unknown filter name {0} standardContext.filterMap.pattern=Invalid <url-pattern> {0} in filter mapping standardContext.filterStart=Exception starting filter {0} +standardContext.filterStartFailed=Failed to start application Filters successfully standardContext.isUnavailable=This application is not currently available standardContext.listenerStart=Exception sending context initialized event to listener instance of class {0} +standardContext.listenerStartFailed=Failed to start application Listeners successfully standardContext.listenerStop=Exception sending context destroyed event to listener instance of class {0} standardContext.loginConfig.errorPage=Form error page {0} must start with a '/' standardContext.loginConfig.errorWarning=WARNING: Form error page {0} must start with a '/' in Servlet 2.3 1.48 +11 -7 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java Index: StandardContext.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- StandardContext.java 2001/03/30 22:27:50 1.47 +++ StandardContext.java 2001/03/30 23:24:04 1.48 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v 1.47 2001/03/30 22:27:50 craigmcc Exp $ - * $Revision: 1.47 $ - * $Date: 2001/03/30 22:27:50 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v 1.48 2001/03/30 23:24:04 craigmcc Exp $ + * $Revision: 1.48 $ + * $Date: 2001/03/30 23:24:04 $ * * ==================================================================== * @@ -140,7 +140,7 @@ * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision: 1.47 $ $Date: 2001/03/30 22:27:50 $ + * @version $Revision: 1.48 $ $Date: 2001/03/30 23:24:04 $ */ public class StandardContext @@ -2267,7 +2267,7 @@ // Create and register the associated naming context, if internal // naming is used - boolean ok = false; + boolean ok = true; if (isUseNaming()) { try { createNamingContext(); @@ -2282,12 +2282,16 @@ // Restart our application event listeners and filters if (ok) { - if (!listenerStart()) + if (!listenerStart()) { + log(sm.getString("standardContext.listenerStartFailed")); ok = false; + } } if (ok) { - if (!filterStart()) + if (!filterStart()) { + log(sm.getString("standardContext.filterStartFailed")); ok = false; + } } // Load sessions from persistent storage, if supported