UI: Remove unnecessary exception throws

When trying to register/remove a UI session, but User Manager service is
unavailable, log a warning instead of throwing exception.

Change-Id: Ia9c161f0c68b5edadad02e701949f0bfda69c4e1
Signed-off-by: Yevgeny Khodorkovsky <ykhodork@cisco.com>

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 a5d76f20521b62c29f9c250998070218e8ebb39a..72b9d6bd26e92a00373077f2fcec8f4919f44588 100644 (file)
--- 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 {
 
 
 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) {
 
     @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) {
     }
 
     @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) {
         if (userManager != null) {

-            return userManager;
+            ((HttpSessionListener) userManager.getSessionManager()).sessionDestroyed(se);

         } else {
         } 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.");

         }
     }
 
         }
     }