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%2Fdependencyresolver%2FDependencyResolverManager.java;h=f8906735b6c12aa70ca80307ba2b40941bbb6a9b;hb=refs%2Fchanges%2F73%2F46573%2F5;hp=3ef6e5d8421ac39834394b34afbf56d58b7eeca8;hpb=f84f3b8fb24b1ee2074fbbb3f5c64e3ba3191e3e;p=controller.git diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverManager.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverManager.java index 3ef6e5d842..f8906735b6 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverManager.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverManager.java @@ -7,8 +7,6 @@ */ package org.opendaylight.controller.config.manager.impl.dependencyresolver; -import static com.google.common.base.Preconditions.checkState; - import com.google.common.base.Preconditions; import com.google.common.reflect.AbstractInvocationHandler; import com.google.common.reflect.Reflection; @@ -143,7 +141,7 @@ public class DependencyResolverManager implements DependencyResolverFactory, Aut return cachedInstance; } - checkState(deadlockMonitor.isAlive(), "Deadlock monitor is not alive"); + Preconditions.checkState(deadlockMonitor.isAlive(), "Deadlock monitor is not alive"); deadlockMonitor.setCurrentlyInstantiatedModule(moduleIdentifier); } try { @@ -225,6 +223,7 @@ public class DependencyResolverManager implements DependencyResolverFactory, Aut @Override public void close() { + modulesHolder.close(); deadlockMonitor.close(); }