svn commit: r833981 - /servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java

[ffang]

Author: ffang
Date: Mon Nov  9 06:59:07 2009
New Revision: 833981

URL: http://svn.apache.org/viewvc?rev=833981&view=rev
Log:
[SMX4NMR-171]when stop a bundle, the underlying counterpart JBI sa/component/sharedlib instance in the bundle should be removed from jmx server

Modified:
    servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java

Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java?rev=833981&r1=833980&r2=833981&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java Mon Nov  9 06:59:07 2009
@@ -497,6 +497,11 @@
                 ((SharedLibraryImpl) lib).removeComponent(component);
             }
             components.remove(component.getName());
+            try {
+ getManagementStrategy().unmanageObject(component);
+ } catch (Exception e) {
+ LOGGER.error("Error unmanage component: " + component.getName(), e);
+ }
         }
     }
 
@@ -505,6 +510,11 @@
             serviceAssemblies.remove(assembly.getName());
             pendingAssemblies.remove(assembly);
             unregisterServices(assembly.getBundle());
+            try {
+ getManagementStrategy().unmanageObject(assembly);
+ } catch (Exception e) {
+ LOGGER.error("Error unmanage service assembly: " + assembly.getName(), e);
+ }
             for (ServiceUnitImpl su : assembly.getServiceUnitsList()) {
                 su.getComponentImpl().removeServiceUnit(su);
             }
@@ -515,6 +525,11 @@
         if (library != null) {
             // TODO: shutdown all components
             sharedLibraries.remove(library.getName());
+            try {
+ getManagementStrategy().unmanageObject(library);
+ } catch (Exception e) {
+ LOGGER.error("Error unmanage sharedlibrary: " + library.getName(), e);
+ }
         }
     }