Author: fhanik
Date: Tue Dec 30 08:51:35 2008
New Revision: 730178
URL: http://svn.apache.org/viewvc?rev=730178&view=rev
Log:
Don't attempt to shutdown when port=-1 in server.xml, instead print error
message
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=730178&r1=730177&r2=730178&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Tue Dec 30
08:51:35 2008
@@ -417,14 +417,19 @@
// Stop the existing server
try {
- Socket socket = new Socket(server.getAddress(), 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) {
+ Socket socket = new Socket(server.getAddress(),
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/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=730178&r1=730177&r2=730178&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Tue
Dec 30 08:51:35 2008
@@ -95,3 +95,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. Shut down server through OS
signal. Server not shut down.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
