From 37b5c088f950d3d260f7f5c6a4c558d924a57f9f Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 9 Mar 2011 18:49:02 +0000
Subject: [PATCH] Fix exception destroying a stopped connector.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1079930 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/core/StandardService.java | 2 +-
 webapps/docs/changelog.xml                         | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/core/StandardService.java b/java/org/apache/catalina/core/StandardService.java
index 8c8383f26..86170e3dd 100644
--- 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 b41eccf9e..def51e5f0 100644
--- 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">
-- 
2.11.0