Re-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360

Log the right message at the right point

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

diff --git a/java/org/apache/coyote/AbstractProtocolHandler.java b/java/org/apache/coyote/AbstractProtocolHandler.java
index b7a00c4..a851e38 100644 (file)
--- a/java/org/apache/coyote/AbstractProtocolHandler.java
+++ b/java/org/apache/coyote/AbstractProtocolHandler.java
@@ -392,16 +392,16 @@ public abstract class AbstractProtocolHandler implements ProtocolHandler,
 
     @Override
     public void stop() throws Exception {
+        if(getLog().isInfoEnabled())
+            getLog().info(sm.getString("abstractProtocolHandler.stop",
+                    getName()));
         try {
             endpoint.stop();
         } catch (Exception ex) {
-            getLog().error(sm.getString("abstractProtocolHandler.stop",
+            getLog().error(sm.getString("abstractProtocolHandler.stopError",
                     getName()), ex);
             throw ex;
         }
-        if(getLog().isInfoEnabled())
-            getLog().info(sm.getString("abstractProtocolHandler.stopError",
-                    getName()));
     }