servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From egl...@apache.org
Subject svn commit: r905708 - /servicemix/smx4/nmr/trunk/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementAgent.java
Date Tue, 02 Feb 2010 17:03:41 GMT
Author: eglynn
Date: Tue Feb  2 17:03:36 2010
New Revision: 905708

URL: http://svn.apache.org/viewvc?rev=905708&view=rev
Log:
Fix for [SMX4NMR-182] Spurious ServiceUnavailableException on shutdown of ManagementAgent

Modified:
    servicemix/smx4/nmr/trunk/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementAgent.java

Modified: servicemix/smx4/nmr/trunk/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementAgent.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementAgent.java?rev=905708&r1=905707&r2=905708&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementAgent.java
(original)
+++ servicemix/smx4/nmr/trunk/nmr/management/src/main/java/org/apache/servicemix/nmr/management/ManagementAgent.java
Tue Feb  2 17:03:36 2010
@@ -118,13 +118,7 @@
      */
     public void unmanageNamedObject(Object name) throws Exception {
         if (name instanceof ObjectName) {
-            try {
-                unregister((ObjectName)name);
-            } catch (ServiceUnavailableException sue) {
-                // due to timing / shutdown ordering issue that we may
-                // ignore as not unregistering from an already shutdown 
-                // blueprint container is quite harmless
-            }
+            unregister((ObjectName)name);
         }
     }
     
@@ -217,6 +211,10 @@
                 } catch (JMException jmex) {
                     LOG.info("Exception unregistering MBean", jmex);
                     caught++;
+                } catch (ServiceUnavailableException sue) {
+                    // due to timing / shutdown ordering issue that we may
+                    // ignore as not unregistering from an already shutdown 
+                    // blueprint container is quite harmless
                 }
             }
             if (caught > 0) {



Mime
View raw message