remm 01/12/09 14:03:44
Modified: catalina/src/share/org/apache/catalina/core Tag:
tomcat_40_branch LocalStrings.properties
StandardHost.java
Log:
- Allow disabling the error report valve by setting the attribute to an empty string.
- Also remove the FIXME related to the error reporting.
Revision Changes Path
No revision
No revision
1.37.2.4 +1 -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.37.2.3
retrieving revision 1.37.2.4
diff -u -r1.37.2.3 -r1.37.2.4
--- LocalStrings.properties 2001/11/10 01:26:44 1.37.2.3
+++ LocalStrings.properties 2001/12/09 22:03:44 1.37.2.4
@@ -90,6 +90,7 @@
standardHost.appBase=Application base directory {0} does not exist
standardHost.installing=Installing web application at context path {0} from URL {1}
standardHost.installError=Error deploying application at context path {0}
+standardHost.invalidErrorReportValveClass=Couldn't load specified error report
valve class: {0}
standardHost.docBase=Document base directory {0} already exists
standardHost.mappingError=MAPPING configuration error for request URI {0}
standardHost.noContext=No Context configured to process this request
1.18.2.2 +9 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java
Index: StandardHost.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -r1.18.2.1 -r1.18.2.2
--- StandardHost.java 2001/10/04 19:27:58 1.18.2.1
+++ StandardHost.java 2001/12/09 22:03:44 1.18.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
1.18.2.1 2001/10/04 19:27:58 remm Exp $
- * $Revision: 1.18.2.1 $
- * $Date: 2001/10/04 19:27:58 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
1.18.2.2 2001/12/09 22:03:44 remm Exp $
+ * $Revision: 1.18.2.2 $
+ * $Date: 2001/12/09 22:03:44 $
*
* ====================================================================
*
@@ -103,7 +103,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.18.2.1 $ $Date: 2001/10/04 19:27:58 $
+ * @version $Revision: 1.18.2.2 $ $Date: 2001/12/09 22:03:44 $
*/
public class StandardHost
@@ -595,14 +595,16 @@
public synchronized void start() throws LifecycleException {
// Set error report valve
- if (errorReportValveClass != null) {
+ if ((errorReportValveClass != null)
+ && (!errorReportValveClass.equals(""))) {
try {
Valve valve = (Valve) Class.forName(errorReportValveClass)
.newInstance();
addValve(valve);
} catch (Throwable t) {
- // FIXME
- t.printStackTrace();
+ log(sm.getString
+ ("standardHost.invalidErrorReportValveClass",
+ errorReportValveClass));
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
