Author: markt
Date: Wed Mar 9 18:49:02 2011
New Revision: 1079930
URL: http://svn.apache.org/viewvc?rev=1079930&view=rev
Log:
Fix exception destroying a stopped connector.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1079930&r1=1079929&r2=1079930&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Wed Mar 9
18:49:02 2011
@@ -304,7 +304,7 @@ public class StandardService extends Lif
}
if (j < 0)
return;
- if (getState().isAvailable()) {
+ if (connectors[j].getState().isAvailable()) {
try {
connectors[j].stop();
} catch (LifecycleException e) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1079930&r1=1079929&r2=1079930&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Mar 9 18:49:02 2011
@@ -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">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
