You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/10/17 09:19:58 UTC
svn commit: r464843 - in
/incubator/servicemix/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr:
DefaultBroker.java SubscriptionManager.java flow/AbstractFlow.java
Author: gnodet
Date: Tue Oct 17 00:19:57 2006
New Revision: 464843
URL: http://svn.apache.org/viewvc?view=rev&rev=464843
Log:
SM-707: Subscription manager and flow mbeans are not unregistered
Modified:
incubator/servicemix/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/DefaultBroker.java
incubator/servicemix/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/SubscriptionManager.java
incubator/servicemix/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java
Modified: incubator/servicemix/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/DefaultBroker.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/DefaultBroker.java?view=diff&rev=464843&r1=464842&r2=464843
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/DefaultBroker.java (original)
+++ incubator/servicemix/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/DefaultBroker.java Tue Oct 17 00:19:57 2006
@@ -207,6 +207,7 @@
for (int i = 0; i < flows.length; i++) {
flows[i].shutDown();
}
+ container.deactivateComponent(SubscriptionManager.COMPONENT_NAME);
super.shutDown();
container.getManagementContext().unregisterMBean(this);
}
@@ -542,4 +543,4 @@
return container;
}
-}
\ No newline at end of file
+}
Modified: incubator/servicemix/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/SubscriptionManager.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/SubscriptionManager.java?view=diff&rev=464843&r1=464842&r2=464843
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/SubscriptionManager.java (original)
+++ incubator/servicemix/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/SubscriptionManager.java Tue Oct 17 00:19:57 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/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java?view=diff&rev=464843&r1=464842&r2=464843
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java (original)
+++ incubator/servicemix/branches/servicemix-3.0/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java Tue Oct 17 00:19:57 2006
@@ -87,8 +87,8 @@
* @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();
}
@@ -100,9 +100,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();
}
@@ -112,10 +113,10 @@
* @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
+ // do send
try {
lock.readLock().lock();
doSend((MessageExchangeImpl) me);
@@ -128,8 +129,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();
@@ -140,8 +141,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;
@@ -260,4 +261,4 @@
this.name = name;
}
-}
\ No newline at end of file
+}