remm 2004/02/26 07:26:13
Modified: catalina/src/share/org/apache/coyote/tomcat5
CoyoteConnector.java LocalStrings.properties
Log:
- Add missing properties. Display the root cause if something bad happens, and
don't rethrow the exception.
Revision Changes Path
1.40 +6 -8
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java
Index: CoyoteConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- CoyoteConnector.java 26 Jan 2004 20:19:10 -0000 1.39
+++ CoyoteConnector.java 26 Feb 2004 15:26:13 -0000 1.40
@@ -1348,7 +1348,7 @@
{
if (initialized) {
log.info(sm.getString("coyoteConnector.alreadyInitialized"));
- return;
+ return;
}
this.initialized = true;
@@ -1459,9 +1459,8 @@
try {
protocolHandler.pause();
} catch (Exception e) {
- throw new LifecycleException
- (sm.getString
- ("coyoteConnector.protocolHandlerPauseFailed", e));
+ log.error(sm.getString
+ ("coyoteConnector.protocolHandlerPauseFailed"), e);
}
}
@@ -1474,9 +1473,8 @@
try {
protocolHandler.resume();
} catch (Exception e) {
- throw new LifecycleException
- (sm.getString
- ("coyoteConnector.protocolHandlerResumeFailed", e));
+ log.error(sm.getString
+ ("coyoteConnector.protocolHandlerResumeFailed"), e);
}
}
1.3 +2 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/LocalStrings.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalStrings.properties 15 Nov 2003 09:45:02 -0000 1.2
+++ LocalStrings.properties 26 Feb 2004 15:26:13 -0000 1.3
@@ -12,6 +12,8 @@
coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler instantiation
failed: {0}
coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed: {0}
coyoteConnector.protocolRegistrationFailed=Protocol JMX registration failed
+coyoteConnector.protocolHandlerPauseFailed=Protocol handler pause failed
+coyoteConnector.protocolHandlerResumeFailed=Protocol handler resume failed
#
# CoyoteAdapter
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
