svn commit: r464844 - in /incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr: DefaultBroker.java SubscriptionManager.java flow/AbstractFlow.java

[gnodet]

Author: gnodet
Date: Tue Oct 17 00:20:04 2006
New Revision: 464844

URL: http://svn.apache.org/viewvc?view=rev&rev=464844
Log:
SM-707: Subscription manager and flow mbeans are not unregistered

Modified:
    
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/DefaultBroker.java
    
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/SubscriptionManager.java
    
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java

Modified: 
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/DefaultBroker.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/DefaultBroker.java?view=diff&rev=464844&r1=464843&r2=464844
==============================================================================
--- 
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/DefaultBroker.java
 (original)
+++ 
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/DefaultBroker.java
 Tue Oct 17 00:20:04 2006
@@ -189,6 +189,7 @@
         for (int i = 0; i < flows.length; i++) {
             flows[i].shutDown();
         }
+        container.deactivateComponent(SubscriptionManager.COMPONENT_NAME);
         super.shutDown();
         container.getManagementContext().unregisterMBean(this);
     }

Modified: 
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/SubscriptionManager.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/SubscriptionManager.java?view=diff&rev=464844&r1=464843&r2=464844
==============================================================================
--- 
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/SubscriptionManager.java
 (original)
+++ 
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/SubscriptionManager.java
 Tue Oct 17 00:20:04 2006
@@ -44,6 +44,8 @@
  */
 public class SubscriptionManager extends ComponentSupport implements 
MessageExchangeListener {
     
+    public static final String COMPONENT_NAME = "#SubscriptionManager#";
+    
     private Registry registry;
     private String flowName;
     private static Log log = LogFactory.getLog(SubscriptionManager.class);
@@ -58,7 +60,7 @@
      */
     public void init(Broker broker, Registry registry) throws JBIException {
         this.registry = registry; 
-        broker.getContainer().activateComponent(this, "#SubscriptionManager#");
+        broker.getContainer().activateComponent(this, COMPONENT_NAME);
     }
 
     /**

Modified: 
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java?view=diff&rev=464844&r1=464843&r2=464844
==============================================================================
--- 
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java
 (original)
+++ 
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java
 Tue Oct 17 00:20:04 2006
@@ -90,8 +90,9 @@
      * @throws JBIException
      */
     public void stop() throws JBIException{
-       if (log.isDebugEnabled())
-               log.debug("Called Flow stop");
+        if (log.isDebugEnabled()) {
+            log.debug("Called Flow stop");
+        }
         if (suspendThread != null){
             suspendThread.interrupt();
         }
@@ -103,9 +104,10 @@
      * @throws JBIException
      */
     public void shutDown() throws JBIException{
-       if (log.isDebugEnabled()) {
-               log.debug("Called Flow shutdown");
+        if (log.isDebugEnabled()) {
+            log.debug("Called Flow shutdown");
         }
+        broker.getContainer().getManagementContext().unregisterMBean(this);
         super.shutDown();
     }
     
@@ -115,8 +117,8 @@
      * @throws JBIException
      */
     public void send(MessageExchange me) throws JBIException{
-       if (log.isDebugEnabled()) {
-               log.debug("Called Flow send");
+        if (log.isDebugEnabled()) {
+            log.debug("Called Flow send");
         }
        // do send
         try {
@@ -131,8 +133,8 @@
      * suspend the flow to prevent any message exchanges
      */
     public synchronized void suspend(){
-       if (log.isDebugEnabled()) {
-               log.debug("Called Flow suspend");
+        if (log.isDebugEnabled()) {
+            log.debug("Called Flow suspend");
         }
         lock.writeLock().lock();
         suspendThread = Thread.currentThread();
@@ -143,8 +145,8 @@
      * resume message exchange processing
      */
     public synchronized void resume(){
-       if (log.isDebugEnabled()) {
-               log.debug("Called Flow resume");
+        if (log.isDebugEnabled()) {
+            log.debug("Called Flow resume");
         }
         lock.writeLock().unlock();
         suspendThread = null;