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%2FModuleInternalInfo.java;h=267e504f859fe3bd024bf5eb2d098fdb4904e935;hp=76299e67a287fc922dbd034bddeeecd8df361602;hb=37b0822a7a60079ccaaf261e8ee4eb6a3636c1a0;hpb=d4e097a03ce5cb23b2418a0bc8fdc182d00da4d0 diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalInfo.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalInfo.java index 76299e67a2..267e504f85 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalInfo.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalInfo.java @@ -8,7 +8,6 @@ package org.opendaylight.controller.config.manager.impl; import javax.annotation.Nullable; - import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.controller.config.manager.impl.dependencyresolver.DestroyedModule; import org.opendaylight.controller.config.manager.impl.dynamicmbean.DynamicReadableWrapper; @@ -45,7 +44,7 @@ public class ModuleInternalInfo implements Comparable, public ModuleInternalInfo(ModuleIdentifier name, @Nullable DynamicReadableWrapper readableModule, OsgiRegistration osgiRegistration, - RootRuntimeBeanRegistratorImpl runtimeBeanRegistrator, + @Nullable RootRuntimeBeanRegistratorImpl runtimeBeanRegistrator, ModuleJMXRegistrator moduleJMXRegistrator, int orderingIdx, boolean isDefaultBean, ModuleFactory moduleFactory, BundleContext bundleContext) { @@ -53,10 +52,6 @@ public class ModuleInternalInfo implements Comparable, throw new IllegalArgumentException( "Parameter 'osgiRegistration' is missing"); } - if (runtimeBeanRegistrator == null) { - throw new IllegalArgumentException( - "Parameter 'runtimeBeanRegistrator' is missing"); - } this.readableModule = readableModule; this.osgiRegistration = osgiRegistration; this.runtimeBeanRegistrator = runtimeBeanRegistrator; @@ -115,7 +110,7 @@ public class ModuleInternalInfo implements Comparable, public DestroyedModule toDestroyedModule() { return new DestroyedModule(getIdentifier(), getReadableModule().getInstance(), getModuleJMXRegistrator(), - getOsgiRegistration(), getOrderingIdx()); + getOsgiRegistration(), getOrderingIdx(), runtimeBeanRegistrator); } @Override