svn commit: r834621 - /incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java

[cw...@apache.org]

Author: cwiklik
Date: Tue Nov 10 19:26:59 2009
New Revision: 834621

URL: http://svn.apache.org/viewvc?rev=834621&view=rev
Log:
UIMA-1654 removes MBean from a JMX server on client shutdown

Modified:
    incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java

Modified: incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java?rev=834621&r1=834620&r2=834621&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java (original)
+++ incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java Tue Nov 10 19:26:59 2009
@@ -123,6 +123,7 @@
 
   protected InitialContext jndiContext;
   
+  private ObjectName clientJmxObjectName = null;
   public BaseUIMAAsynchronousEngine_impl() {
     UIMAFramework.getLogger(CLASS_NAME).log(Level.INFO,
             "UIMA-AS version " + UIMAFramework.getVersionString());
@@ -147,8 +148,7 @@
    */
   public String getEndPointName() throws ResourceProcessException {
     try {
-      return ((ActiveMQDestination) sender.getMessageProducer().getDestination()).getPhysicalName();
-      // return (((ActiveMQDestination) producer.getDestination()).getPhysicalName());
+      return clientSideJmxStats.getEndpointName();
     } catch (Exception e) {
       throw new ResourceProcessException(e);
     }
@@ -273,7 +273,9 @@
           } catch (JMSException exx) {
           }
         }
+        // unregister client
         if (jmxManager != null) {
+          jmxManager.unregisterMBean(clientJmxObjectName);
           jmxManager.destroy();
         }
       } catch (Exception e) {
@@ -618,8 +620,8 @@
       applicationName += "_" + uuid;
       jmxManager = new JmxManager("org.apache.uima");
       clientSideJmxStats.setApplicationName(applicationName);
-      ObjectName on = new ObjectName("org.apache.uima:name=" + applicationName);
-      jmxManager.registerMBean(clientSideJmxStats, on);
+      clientJmxObjectName = new ObjectName("org.apache.uima:name=" + applicationName);
+      jmxManager.registerMBean(clientSideJmxStats, clientJmxObjectName);
 
       Properties props = new Properties();
       props.setProperty(Context.INITIAL_CONTEXT_FACTORY,"org.apache.activemq.jndi.ActiveMQInitialContextFactory");