From 0c7312270a23f44405734df4fb9508403af6f271 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 22 Oct 2015 13:01:13 -0700 Subject: [PATCH] Fix resource leaks in exception handling Fix resource leaks when exceptions are encountered during ConfigManagerActivator.start(). Change-Id: Ic12c756aa5a768add0bc62e71eed94e5b2fa5fea Signed-off-by: Gary Wu --- .../config/manager/impl/osgi/ConfigManagerActivator.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ConfigManagerActivator.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ConfigManagerActivator.java index 1f538e5c6d..50ab13eb68 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ConfigManagerActivator.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ConfigManagerActivator.java @@ -98,6 +98,7 @@ public class ConfigManagerActivator implements BundleActivator { try { configRegistryJMXRegistrator.registerToJMXNoNotifications(configRegistry); } catch (InstanceAlreadyExistsException e) { + configRegistryJMXRegistrator.close(); throw new IllegalStateException("Config Registry was already registered to JMX", e); } @@ -106,6 +107,8 @@ public class ConfigManagerActivator implements BundleActivator { try { configRegistryJMXRegistrator.registerToJMX(notifyingConfigRegistry); } catch (InstanceAlreadyExistsException e) { + configRegistryJMXRegistrator.close(); + configRegistryJMXRegistratorWithNotifications.close(); throw new IllegalStateException("Config Registry was already registered to JMX", e); } -- 2.36.6