Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-4514: do not retain old internal info
[controller.git]
/
opendaylight
/
config
/
config-manager
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
manager
/
impl
/
dependencyresolver
/
ModuleInternalTransactionalInfo.java
diff --git
a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/ModuleInternalTransactionalInfo.java
b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/ModuleInternalTransactionalInfo.java
index 210b6d2aa702793fddb1d6f25f2c12c45074f6dc..fc9b645ea2b0220a301858edfef47d0474994c10 100644
(file)
--- a/
opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/ModuleInternalTransactionalInfo.java
+++ b/
opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/ModuleInternalTransactionalInfo.java
@@
-8,6
+8,7
@@
package org.opendaylight.controller.config.manager.impl.dependencyresolver;
import com.google.common.base.Preconditions;
package org.opendaylight.controller.config.manager.impl.dependencyresolver;
import com.google.common.base.Preconditions;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opendaylight.controller.config.api.ModuleIdentifier;
import org.opendaylight.controller.config.manager.impl.ModuleInternalInfo;
import javax.annotation.Nullable;
import org.opendaylight.controller.config.api.ModuleIdentifier;
import org.opendaylight.controller.config.manager.impl.ModuleInternalInfo;
@@
-22,11
+23,11
@@
public class ModuleInternalTransactionalInfo implements Identifiable<ModuleIdent
private final ModuleIdentifier name;
private final Module proxiedModule, realModule;
private final ModuleFactory moduleFactory;
private final ModuleIdentifier name;
private final Module proxiedModule, realModule;
private final ModuleFactory moduleFactory;
- @Nullable
- private final ModuleInternalInfo maybeOldInternalInfo;
+
private final TransactionModuleJMXRegistration transactionModuleJMXRegistration;
private final boolean isDefaultBean;
private final BundleContext bundleContext;
private final TransactionModuleJMXRegistration transactionModuleJMXRegistration;
private final boolean isDefaultBean;
private final BundleContext bundleContext;
+ @Nullable private ModuleInternalInfo maybeOldInternalInfo;
public ModuleInternalTransactionalInfo(ModuleIdentifier name, Module proxiedModule,
ModuleFactory moduleFactory,
public ModuleInternalTransactionalInfo(ModuleIdentifier name, Module proxiedModule,
ModuleFactory moduleFactory,
@@
-69,11
+70,15
@@
public class ModuleInternalTransactionalInfo implements Identifiable<ModuleIdent
return moduleFactory;
}
return moduleFactory;
}
- @Nullable
- public ModuleInternalInfo getOldInternalInfo() {
+ @Nonnull public ModuleInternalInfo getOldInternalInfo() {
return Preconditions.checkNotNull(maybeOldInternalInfo);
}
return Preconditions.checkNotNull(maybeOldInternalInfo);
}
+ public void clearOldInternalInfo() {
+ Preconditions.checkState(maybeOldInternalInfo != null, "No old internal info present");
+ maybeOldInternalInfo = null;
+ }
+
public TransactionModuleJMXRegistration getTransactionModuleJMXRegistration() {
return transactionModuleJMXRegistration;
}
public TransactionModuleJMXRegistration getTransactionModuleJMXRegistration() {
return transactionModuleJMXRegistration;
}