/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2013, 2017 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import org.opendaylight.controller.config.api.ModuleIdentifier;
import org.opendaylight.controller.config.manager.impl.jmx.ModuleJMXRegistrator;
+import org.opendaylight.controller.config.manager.impl.jmx.RootRuntimeBeanRegistratorImpl;
import org.opendaylight.controller.config.manager.impl.osgi.BeanToOsgiServiceManager.OsgiRegistration;
import org.opendaylight.yangtools.concepts.Identifiable;
import org.slf4j.Logger;
private final ModuleJMXRegistrator oldJMXRegistrator;
private final OsgiRegistration osgiRegistration;
private final int orderingIdx;
+ private final RootRuntimeBeanRegistratorImpl runtimeBeanRegistrator;
- public DestroyedModule(ModuleIdentifier identifier, AutoCloseable instance,
- ModuleJMXRegistrator oldJMXRegistrator,
- OsgiRegistration osgiRegistration, int orderingIdx) {
+ public DestroyedModule(final ModuleIdentifier identifier, final AutoCloseable instance,
+ final ModuleJMXRegistrator oldJMXRegistrator,
+ final OsgiRegistration osgiRegistration, final int orderingIdx,
+ final RootRuntimeBeanRegistratorImpl runtimeBeanRegistrator) {
this.identifier = identifier;
this.instance = instance;
this.oldJMXRegistrator = oldJMXRegistrator;
this.osgiRegistration = osgiRegistration;
this.orderingIdx = orderingIdx;
+ this.runtimeBeanRegistrator = runtimeBeanRegistrator;
}
@Override
+ @SuppressWarnings("IllegalCatch")
public void close() {
LOG.trace("Destroying {}", identifier);
try {
instance.close();
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("Error while closing instance of {}", identifier, e);
}
try {
oldJMXRegistrator.close();
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("Error while closing jmx registrator of {}", identifier, e);
}
+ try {
+ if (runtimeBeanRegistrator != null) {
+ runtimeBeanRegistrator.close();
+ }
+ } catch (final Exception e) {
+ LOG.error("Error while closing runtime bean jmx registrator of {}", identifier, e);
+ }
try {
osgiRegistration.close();
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("Error while closing osgi registration of {}", identifier, e);
}
}
@Override
- public int compareTo(DestroyedModule o) {
- return Integer.compare(orderingIdx, o.orderingIdx);
+ public int compareTo(final DestroyedModule destroyedModule) {
+ return Integer.compare(orderingIdx, destroyedModule.orderingIdx);
}
@Override