X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2FDestroyedModule.java;h=e4652c9bb8854fa09afe66d82eeecdb22bd05ba1;hb=efa5be8f930f3eda7094c314e22347868b9db173;hp=4913604512fb0ce62a08789b32441a6ce3da2af6;hpb=397cc9012f67596848019ca7874f3a303523b7e6;p=controller.git diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/DestroyedModule.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/DestroyedModule.java index 4913604512..e4652c9bb8 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/DestroyedModule.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/DestroyedModule.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.config.manager.impl; import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.controller.config.manager.impl.jmx.ModuleJMXRegistrator; import org.opendaylight.controller.config.manager.impl.osgi.BeanToOsgiServiceManager.OsgiRegistration; +import org.opendaylight.yangtools.concepts.Identifiable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,47 +21,43 @@ import org.slf4j.LoggerFactory; * compareTo method. */ public class DestroyedModule implements AutoCloseable, - Comparable { + Comparable, Identifiable { private static final Logger logger = LoggerFactory .getLogger(DestroyedModule.class); - private final ModuleIdentifier name; + private final ModuleIdentifier identifier; private final AutoCloseable instance; private final ModuleJMXRegistrator oldJMXRegistrator; private final OsgiRegistration osgiRegistration; private final int orderingIdx; - DestroyedModule(ModuleIdentifier name, AutoCloseable instance, + DestroyedModule(ModuleIdentifier identifier, AutoCloseable instance, ModuleJMXRegistrator oldJMXRegistrator, OsgiRegistration osgiRegistration, int orderingIdx) { - this.name = name; + this.identifier = identifier; this.instance = instance; this.oldJMXRegistrator = oldJMXRegistrator; this.osgiRegistration = osgiRegistration; this.orderingIdx = orderingIdx; } - public ModuleIdentifier getName() { - return name; - } - @Override public void close() { - logger.info("Destroying {}", name); + logger.trace("Destroying {}", identifier); try { instance.close(); } catch (Exception e) { - logger.error("Error while closing instance of {}", name, e); + logger.error("Error while closing instance of {}", identifier, e); } try { oldJMXRegistrator.close(); } catch (Exception e) { - logger.error("Error while closing jmx registrator of {}", name, e); + logger.error("Error while closing jmx registrator of {}", identifier, e); } try { osgiRegistration.close(); } catch (Exception e) { - logger.error("Error while closing osgi registration of {}", name, e); + logger.error("Error while closing osgi registration of {}", identifier, e); } } @@ -68,4 +65,9 @@ public class DestroyedModule implements AutoCloseable, public int compareTo(DestroyedModule o) { return Integer.compare(orderingIdx, o.orderingIdx); } + + @Override + public ModuleIdentifier getIdentifier() { + return identifier; + } }