X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-event-listener%2Fappc-event-listener-bundle%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fappc%2Flistener%2FAppcEventListenerActivator.java;h=a65b315e446d25e7f48470b5407617fba660cfcf;hb=3b7892e138cf77cbdbadc13a83bf50726c3b22a7;hp=0b1eb53288446071ccb6e27935220bb8bea966b7;hpb=ff3c47b5cd2333ee97816b11999edb9c493ee9b8;p=appc.git

diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/AppcEventListenerActivator.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/AppcEventListenerActivator.java
index 0b1eb5328..a65b315e4 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/AppcEventListenerActivator.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/AppcEventListenerActivator.java
@@ -79,11 +79,6 @@ public class AppcEventListenerActivator implements BundleActivator {
      */
     private Configuration configuration;
 
-    /**
-     * The bundle context
-     */
-    private static BundleContext context;
-
     /**
      * The reference to the actual implementation object that implements the services
      */
@@ -113,8 +108,6 @@ public class AppcEventListenerActivator implements BundleActivator {
     public void start(BundleContext ctx) throws Exception {
         LOG.info("Starting Bundle " + getName());
 
-        context = ctx;
-
         configuration = ConfigurationFactory.getConfiguration();
 
         Properties props = configuration.getProperties();
@@ -126,8 +119,6 @@ public class AppcEventListenerActivator implements BundleActivator {
         demoProps.setListenerClass(org.onap.appc.listener.demo.impl.ListenerImpl.class);
         listeners.add(demoProps);
 
-        // ===========================================================================
-
         ListenerProperties clLCMProps = new ListenerProperties("appc.LCM", props);
         clLCMProps.setListenerClass(org.onap.appc.listener.LCM.impl.ListenerImpl.class);
         listeners.add(clLCMProps);
@@ -194,8 +185,14 @@ public class AppcEventListenerActivator implements BundleActivator {
     private boolean isAppcOamPropsListenerEnabled(ListenerProperties listenerProperties) {
         final Properties appcOamProperties = listenerProperties.getProperties();
 
-        return appcOamProperties == null
-                || !Boolean.parseBoolean(appcOamProperties.getProperty(
-                        ListenerProperties.KEYS.DISABLED.getPropertySuffix()));
+        boolean result;
+        if (appcOamProperties == null) {
+            result = true;
+        } else {
+            result = !Boolean.parseBoolean(appcOamProperties.getProperty(
+                    ListenerProperties.KEYS.DISABLED.getPropertySuffix()));
+        }
+
+        return result;
     }
 }