X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fweb%2Froot%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fweb%2FControllerUISessionManager.java;h=72b9d6bd26e92a00373077f2fcec8f4919f44588;hp=a5d76f20521b62c29f9c250998070218e8ebb39a;hb=e570e9fdf225ff4fbfd7edc94b984343a04c75a8;hpb=e34a8ad4271e43fd903523a04ccf2a44ff4995f2

diff --git a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/ControllerUISessionManager.java b/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/ControllerUISessionManager.java
index a5d76f2052..72b9d6bd26 100644
--- a/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/ControllerUISessionManager.java
+++ b/opendaylight/web/root/src/main/java/org/opendaylight/controller/web/ControllerUISessionManager.java
@@ -18,29 +18,25 @@ import org.slf4j.LoggerFactory;
 
 public class ControllerUISessionManager implements HttpSessionListener {
 
-    private static final Logger logger = LoggerFactory
-            .getLogger(ControllerUISessionManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(ControllerUISessionManager.class);
 
     @Override
     public void sessionCreated(HttpSessionEvent se) {
-        ((HttpSessionListener) getUserManagerRef().getSessionManager())
-                .sessionCreated(se);
+        IUserManager userManager = (IUserManager) ServiceHelper.getGlobalInstance(IUserManager.class, this);
+        if (userManager != null) {
+            ((HttpSessionListener) userManager.getSessionManager()).sessionCreated(se);
+        } else {
+            logger.warn("User Manager is currently unavailable. Unable to register UI session.");
+        }
     }
 
     @Override
     public void sessionDestroyed(HttpSessionEvent se) {
-        ((HttpSessionListener) getUserManagerRef().getSessionManager())
-                .sessionDestroyed(se);
-    }
-
-    private IUserManager getUserManagerRef() {
-        IUserManager userManager = (IUserManager) ServiceHelper
-                .getGlobalInstance(IUserManager.class, this);
+        IUserManager userManager = (IUserManager) ServiceHelper.getGlobalInstance(IUserManager.class, this);
         if (userManager != null) {
-            return userManager;
+            ((HttpSessionListener) userManager.getSessionManager()).sessionDestroyed(se);
         } else {
-            logger.error("UserManager Ref is null. ");
-            throw new RuntimeException("UserManager Ref is null. ");
+            logger.warn("User Manager is currently unavailable. Unable to destroy UI session.");
         }
     }