Author: fhanik
Date: Mon Jan 26 17:55:19 2009
New Revision: 737768
URL: http://svn.apache.org/viewvc?rev=737768&view=rev
Log:
Print out user friendly message during shutdown without shutdown port
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=737768&r1=737767&r2=737768&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 26 17:55:19 2009
@@ -150,11 +150,6 @@
+1: markt, fhanik, remm
-1:
-* Print user friendly message when attempting to shutdown and shutdown port is
disabled
- http://svn.apache.org/viewvc?rev=730178&view=rev
- +1: fhanik, remm, funkman
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36923
If EL is disabled, treat it as template text
http://svn.apache.org/viewvc?rev=730590&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java?rev=737768&r1=737767&r2=737768&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java Mon Jan
26 17:55:19 2009
@@ -417,15 +417,20 @@
// Stop the existing server
try {
- String hostAddress =
InetAddress.getByName("localhost").getHostAddress();
- Socket socket = new Socket(hostAddress, server.getPort());
- OutputStream stream = socket.getOutputStream();
- String shutdown = server.getShutdown();
- for (int i = 0; i < shutdown.length(); i++)
- stream.write(shutdown.charAt(i));
- stream.flush();
- stream.close();
- socket.close();
+ if (server.getPort()>0) {
+ String hostAddress =
InetAddress.getByName("localhost").getHostAddress();
+ Socket socket = new Socket(hostAddress, server.getPort());
+ OutputStream stream = socket.getOutputStream();
+ String shutdown = server.getShutdown();
+ for (int i = 0; i < shutdown.length(); i++)
+ stream.write(shutdown.charAt(i));
+ stream.flush();
+ stream.close();
+ socket.close();
+ } else {
+ log.error(sm.getString("catalina.stopServer"));
+ System.exit(1);
+ }
} catch (IOException e) {
log.error("Catalina.stop: ", e);
System.exit(1);
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=737768&r1=737767&r2=737768&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Mon Jan 26 17:55:19 2009
@@ -93,3 +93,4 @@
userConfig.error=Error deploying web application for user {0}
userConfig.start=UserConfig: Processing START
userConfig.stop=UserConfig: Processing STOP
+catalina.stopServer=No shutdown port configured in server.xml. Please shut
down server through OS signal. Server not shut down by external JVM.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
