diff --git a/distro/changelog.xml b/distro/changelog.xml index 6e58698..d52ae8a 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,7 +1,8 @@ + date="2015-10-15"> Fixed typoe in html >(reload this page) + Further Check if in portal when getting ASL null, see Bug #708 diff --git a/pom.xml b/pom.xml index f71e26d..a8edc6e 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ - 2.5.1 + 2.7.0 distro 1.7 @@ -48,6 +48,7 @@ com.google.gwt gwt-user + ${gwtVersion} provided diff --git a/src/main/java/org/gcube/portlets/widgets/sessionchecker/server/SessionCheckerServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/sessionchecker/server/SessionCheckerServiceImpl.java index dd90f0a..ec2eac2 100644 --- a/src/main/java/org/gcube/portlets/widgets/sessionchecker/server/SessionCheckerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/sessionchecker/server/SessionCheckerServiceImpl.java @@ -60,9 +60,14 @@ public class SessionCheckerServiceImpl extends RemoteServiceServlet implements } } catch (Exception e) { - _log.warn("Stopping session polling as you are in dev mode (am I wrong?)"); - e.printStackTrace(); - return new SessionInfoBean("","", true); //tells that you are in development mode + if (isWithinPortal()) { + _log.warn("Liferay Portal Detected but session Expired"); + return new SessionInfoBean("",""); //tells session expired + } + else { + _log.warn("Stopping session polling as i think you are in development mode"); + return new SessionInfoBean("","", true); //tells that you are in development mode + } } String user = session.getUsername(); String scope = session.getScope(); @@ -77,4 +82,18 @@ public class SessionCheckerServiceImpl extends RemoteServiceServlet implements return new SessionInfoBean(session.getUsername(), session.getScope()); } + /** + * + * @return true if you're running into the portal, false if in development + */ + private boolean isWithinPortal() { + try { + UserLocalServiceUtil.getService(); + return true; + } + catch (com.liferay.portal.kernel.bean.BeanLocatorException ex) { + _log.trace("Development Mode ON"); + return false; + } + } }