Don't attempt to shutdown when port=-1 in server.xml, instead print error message

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@730178 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java
index d2b32ed..df58eba 100644 (file)
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -417,14 +417,19 @@ public class Catalina extends Embedded {
 
         // 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);

diff --git a/java/org/apache/catalina/startup/LocalStrings.properties b/java/org/apache/catalina/startup/LocalStrings.properties
index de5c08a..5bf7390 100644 (file)
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -95,3 +95,4 @@ userConfig.deploying=Deploying user web applications
 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.