Fix exception destroying a stopped connector.

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

diff --git a/java/org/apache/catalina/core/StandardService.java b/java/org/apache/catalina/core/StandardService.java
index 8c8383f..86170e3 100644 (file)
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -304,7 +304,7 @@ public class StandardService extends LifecycleMBeanBase implements Service {
             }
             if (j < 0)
                 return;
-            if (getState().isAvailable()) {
+            if (connectors[j].getState().isAvailable()) {
                 try {
                     connectors[j].stop();
                 } catch (LifecycleException e) {

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b41eccf..def51e5 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -78,6 +78,10 @@
         <bug>50893</bug>: Add additional information to the download README for
         the extras components. (markt)
       </fix>
+      <fix>
+        Calling <code>stop()</code> and then <code>destroy()</code> on a
+        connector in correctly triggered an exception. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">