From e570e9fdf225ff4fbfd7edc94b984343a04c75a8 Mon Sep 17 00:00:00 2001 From: Yevgeny Khodorkovsky Date: Thu, 8 Aug 2013 21:54:44 -0700 Subject: [PATCH] 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 --- .../web/ControllerUISessionManager.java | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) 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."); } } -- 2.36.6