Minor clean-up having reviewed the diff between current code and the code prior to...

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

diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java
index a8b2fa4..670516a 100644 (file)
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -96,6 +96,12 @@ public class Catalina {
 
 
     /**
+     * The server component we are starting or stopping.
+     */
+    protected Server server = null;
+
+    
+    /**
      * Are we starting a new server?
      */
     protected boolean starting = false;
@@ -120,12 +126,6 @@ public class Catalina {
 
 
     /**
-     * The Server object for this Tomcat instance
-     */
-    protected Server server = null;
-
-    
-    /**
      * Is naming enabled ?
      */
     protected boolean useNaming = true;
@@ -780,11 +780,7 @@ public class Catalina {
         public void run() {
 
             if (getServer() != null) {
-                try {
-                    Catalina.this.stop();
-                } catch (Exception e) {
-                    log.error(sm.getString("catalina.shutdownHookFail"), e);
-                }
+                Catalina.this.stop();
             }
             
             // If JULI is used, shut JULI down *after* the server shuts down

diff --git a/java/org/apache/catalina/startup/LocalStrings.properties b/java/org/apache/catalina/startup/LocalStrings.properties
index c9af91a..9536fff 100644 (file)
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-catalina.shutdownHookFail=The shutdown hook experienced an error while trying to stop the server
 catalina.stopServer=No shutdown port configured. Shut down server through OS signal. Server not shut down.
 contextConfig.altDDNotFound=alt-dd file {0} not found
 contextConfig.applicationUrl=Unable to determine URL for application web.xml