X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2FDestroyedModule.java;h=e4652c9bb8854fa09afe66d82eeecdb22bd05ba1;hp=47f34e25f8fb3340adeacc19c56cfbad8de6e465;hb=af3eaa839bf6f6c86495b24d2174eeb6624501c0;hpb=9fb64948564e252018f9b1e13e7cea2c92f991aa

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 47f34e25f8..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,7 +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.protocol.concepts.NamedObject;
+import org.opendaylight.yangtools.concepts.Identifiable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,49 +20,44 @@ import org.slf4j.LoggerFactory;
  * were created. Module instances should be closed in order defined by the
  * compareTo method.
  */
-public class DestroyedModule implements NamedObject<ModuleIdentifier>,
-        AutoCloseable, Comparable<DestroyedModule> {
+public class DestroyedModule implements AutoCloseable,
+        Comparable<DestroyedModule>, Identifiable<ModuleIdentifier> {
     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;
     }
 
-    @Override
-    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);
         }
     }
 
@@ -70,4 +65,9 @@ public class DestroyedModule implements NamedObject<ModuleIdentifier>,
     public int compareTo(DestroyedModule o) {
         return Integer.compare(orderingIdx, o.orderingIdx);
     }
+
+    @Override
+    public ModuleIdentifier getIdentifier() {
+        return identifier;
+    }
 }