commit e71dfa48476b4920fb22ef17a8ade408d629e3ad
author Changhoon Yoon <chyoon87@kaist.ac.kr> Fri Dec 04 21:49:25 2015 +0900
committer Brian O'Connor <bocon@onlab.us> Tue Jan 05 14:14:18 2016 -0800
tree e365879b845904afc04b3627e6b06b5c165423cd
parent 9e51fd0a7eca54c1396f5e7e3e30a1f48b864db9

ONOS-3521: SM-ONOS performance improvement

Change-Id: I8643187f2ceb35f8e0701d9e7ddb10098f05b244

core/security/src/main/java/org/onosproject/security/impl/SecurityModeManager.java

diff --git a/core/security/src/main/java/org/onosproject/security/impl/SecurityModeManager.java b/core/security/src/main/java/org/onosproject/security/impl/SecurityModeManager.java
index 325f49b..f928dd6 100644
--- a/core/security/src/main/java/org/onosproject/security/impl/SecurityModeManager.java
+++ b/core/security/src/main/java/org/onosproject/security/impl/SecurityModeManager.java
@@ -92,16 +92,12 @@
 
     private PermissionAdmin permissionAdmin = getPermissionAdmin();
 
-
     @Activate
     public void activate() {
 
         eventDispatcher.addSink(SecurityModeEvent.class, listenerRegistry);
-        // add Listeners
         logReaderService.addLogListener(securityLogListener);
 
-        store.setDelegate(delegate);
-
         if (System.getSecurityManager() == null) {
             log.warn("J2EE security manager is disabled.");
             deactivate();
@@ -112,6 +108,7 @@
             deactivate();
             return;
         }
+        store.setDelegate(delegate);
 
         log.info("Security-Mode Started");
     }
@@ -302,4 +299,6 @@
         return FrameworkUtil.getBundle(this.getClass()).getBundleContext();
 
     }
+
+
 }
\ No newline at end of file