config-manager: final parameters

[controller.git] / opendaylight / config / config-manager / src / main / java / org / opendaylight / controller / config / manager / impl / dependencyresolver / DestroyedModule.java

diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DestroyedModule.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DestroyedModule.java
index 2aa74758d47c6fd2c7cc6b1fa095695ea8e91ded..d449e28dfe9b8a1268dfd40240932e7df6018b03 100644 (file)
--- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DestroyedModule.java
+++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DestroyedModule.java
@@ -9,6 +9,7 @@ package org.opendaylight.controller.config.manager.impl.dependencyresolver;
 
 import org.opendaylight.controller.config.api.ModuleIdentifier;
 import org.opendaylight.controller.config.manager.impl.jmx.ModuleJMXRegistrator;
+import org.opendaylight.controller.config.manager.impl.jmx.RootRuntimeBeanRegistratorImpl;
 import org.opendaylight.controller.config.manager.impl.osgi.BeanToOsgiServiceManager.OsgiRegistration;
 import org.opendaylight.yangtools.concepts.Identifiable;
 import org.slf4j.Logger;
@@ -22,7 +23,7 @@ import org.slf4j.LoggerFactory;
  */
 public class DestroyedModule implements AutoCloseable,
         Comparable<DestroyedModule>, Identifiable<ModuleIdentifier> {
-    private static final Logger logger = LoggerFactory
+    private static final Logger LOG = LoggerFactory
             .getLogger(DestroyedModule.class);
 
     private final ModuleIdentifier identifier;
@@ -30,39 +31,49 @@ public class DestroyedModule implements AutoCloseable,
     private final ModuleJMXRegistrator oldJMXRegistrator;
     private final OsgiRegistration osgiRegistration;
     private final int orderingIdx;
+    private RootRuntimeBeanRegistratorImpl runtimeBeanRegistrator;
 
-    public DestroyedModule(ModuleIdentifier identifier, AutoCloseable instance,
-            ModuleJMXRegistrator oldJMXRegistrator,
-            OsgiRegistration osgiRegistration, int orderingIdx) {
+    public DestroyedModule(final ModuleIdentifier identifier, final AutoCloseable instance,
+                           final ModuleJMXRegistrator oldJMXRegistrator,
+                           final OsgiRegistration osgiRegistration, final int orderingIdx,
+                           final RootRuntimeBeanRegistratorImpl runtimeBeanRegistrator) {
         this.identifier = identifier;
         this.instance = instance;
         this.oldJMXRegistrator = oldJMXRegistrator;
         this.osgiRegistration = osgiRegistration;
         this.orderingIdx = orderingIdx;
+        this.runtimeBeanRegistrator = runtimeBeanRegistrator;
     }
 
     @Override
     public void close() {
-        logger.trace("Destroying {}", identifier);
+        LOG.trace("Destroying {}", identifier);
         try {
             instance.close();
-        } catch (Exception e) {
-            logger.error("Error while closing instance of {}", identifier, e);
+        } catch (final Exception e) {
+            LOG.error("Error while closing instance of {}", identifier, e);
         }
         try {
             oldJMXRegistrator.close();
-        } catch (Exception e) {
-            logger.error("Error while closing jmx registrator of {}", identifier, e);
+        } catch (final Exception e) {
+            LOG.error("Error while closing jmx registrator of {}", identifier, e);
+        }
+        try {
+            if (runtimeBeanRegistrator != null) {
+                runtimeBeanRegistrator.close();
+            }
+        } catch (final Exception e) {
+            LOG.error("Error while closing runtime bean jmx registrator of {}", identifier, e);
         }
         try {
             osgiRegistration.close();
-        } catch (Exception e) {
-            logger.error("Error while closing osgi registration of {}", identifier, e);
+        } catch (final Exception e) {
+            LOG.error("Error while closing osgi registration of {}", identifier, e);
         }
     }
 
     @Override
-    public int compareTo(DestroyedModule o) {
+    public int compareTo(final DestroyedModule o) {
         return Integer.compare(orderingIdx, o.orderingIdx);
     }