1 files changed, 28 insertions, 0 deletions
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ContextListener.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ContextListener.java
new file mode 100644
index 0000000000..cf87db936d
--- /dev/null
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ContextListener.java
@@ -0,0 +1,28 @@
+package org.onap.config.impl;
+
+import static org.onap.config.Constants.MBEAN_NAME;
+
+import java.lang.management.ManagementFactory;
+import javax.management.ObjectName;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+import org.onap.config.api.ConfigurationManager;
+
+@WebListener
+public class ContextListener implements ServletContextListener {
+
+  @Override
+  public void contextDestroyed(ServletContextEvent arg0) {
+    try {
+      ManagementFactory.getPlatformMBeanServer().unregisterMBean(new ObjectName(MBEAN_NAME));
+    } catch (Exception exception) {
+      exception.printStackTrace();
+    }
+  }
+
+  @Override
+  public void contextInitialized(ServletContextEvent arg0) {
+    ConfigurationManager.lookup();
+  }
+}