You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/04/21 08:32:07 UTC
svn commit: r936173 -
/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Author: davsclaus
Date: Wed Apr 21 06:32:07 2010
New Revision: 936173
URL: http://svn.apache.org/viewvc?rev=936173&view=rev
Log:
CAMEL-2652: Applied patch with thanks to David Valeri.
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=936173&r1=936172&r2=936173&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java Wed Apr 21 06:32:07 2010
@@ -535,10 +535,9 @@ public class JettyHttpComponent extends
connectorRef.server.stop();
// Camel controls the lifecycle of these entities so remove the
// registered MBeans when Camel is done with the managed objects.
- MBeanContainer containerToClean = getMbContainer();
- if (containerToClean != null) {
- containerToClean.removeBean(connectorRef.server);
- containerToClean.removeBean(connectorRef.connector);
+ if (mbContainer != null) {
+ mbContainer.removeBean(connectorRef.server);
+ mbContainer.removeBean(connectorRef.connector);
}
}
CONNECTORS.clear();