Fix race conditions between config-manager and persister.

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

diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalTransactionalInfo.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalTransactionalInfo.java
index c71c3bb4701c040e825e33807b979a60ff1d6aa3..c4f40fbeeb42a6c05e08a6213fc2d928d2a912da 100644 (file)
--- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalTransactionalInfo.java
+++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalTransactionalInfo.java
@@ -11,15 +11,13 @@ import javax.annotation.Nullable;
 
 import org.opendaylight.controller.config.api.ModuleIdentifier;
 import org.opendaylight.controller.config.manager.impl.dynamicmbean.DynamicReadableWrapper;
-import org.opendaylight.controller.config.manager.impl.jmx.TransactionModuleJMXRegistrator;
 import org.opendaylight.controller.config.manager.impl.jmx.TransactionModuleJMXRegistrator
         .TransactionModuleJMXRegistration;
 import org.opendaylight.controller.config.spi.Module;
 import org.opendaylight.controller.config.spi.ModuleFactory;
-import org.opendaylight.protocol.concepts.NamedObject;
+import org.opendaylight.yangtools.concepts.Identifiable;
 
-public class ModuleInternalTransactionalInfo implements
-        NamedObject<ModuleIdentifier> {
+public class ModuleInternalTransactionalInfo implements Identifiable<ModuleIdentifier> {
     private final ModuleIdentifier name;
     private final Module module;
     private final ModuleFactory moduleFactory;
@@ -38,7 +36,11 @@ public class ModuleInternalTransactionalInfo implements
         this.transactionModuleJMXRegistration = transactionModuleJMXRegistration;
     }
 
-    @Override
+
+    /**
+     * Use {@link #getIdentifier()} instead.
+     */
+    @Deprecated
     public ModuleIdentifier getName() {
         return name;
     }
@@ -49,7 +51,7 @@ public class ModuleInternalTransactionalInfo implements
 
     public DestroyedModule toDestroyedModule() {
         if (maybeOldInternalInfo == null) {
-            throw new IllegalStateException("Cannot destoy uncommitted module");
+            throw new IllegalStateException("Cannot destroy uncommitted module");
         }
         DynamicReadableWrapper oldModule = maybeOldInternalInfo
                 .getReadableModule();
@@ -59,6 +61,7 @@ public class ModuleInternalTransactionalInfo implements
                 maybeOldInternalInfo.getOrderingIdx());
     }
 
+
     public Module getModule() {
         return module;
     }
@@ -77,4 +80,9 @@ public class ModuleInternalTransactionalInfo implements
     public TransactionModuleJMXRegistration getTransactionModuleJMXRegistration() {
         return transactionModuleJMXRegistration;
     }
+
+    @Override
+    public ModuleIdentifier getIdentifier() {
+        return name;
+    }
 }