From 751717fe00eb7faa9915b752ce49b2db1a21f368 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Thu, 15 Oct 2015 14:45:06 +0000
Subject: [PATCH] Bug #708 fix

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/widgets/session-checker@119814 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                          |  3 ++-
 pom.xml                                       |  3 ++-
 .../server/SessionCheckerServiceImpl.java     | 25 ++++++++++++++++---
 3 files changed, 26 insertions(+), 5 deletions(-)

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 @@
 <ReleaseNotes>
 <Changeset component="org.gcube.portlets.widgets.sessionchecher.0-4-0"
-		date="2015-09-01">
+		date="2015-10-15">
 			<Change>Fixed typoe in html >(reload this page)</Change>
+			<Change>Further Check if in portal when getting ASL null, see Bug #708</Change>
 	</Changeset>
 <Changeset component="org.gcube.portlets.widgets.sessionchecher.0-3-0"
 		date="2014-10-06">
diff --git a/pom.xml b/pom.xml
index f71e26d..a8edc6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 	</scm>
 	<properties>
 		<!-- Convenience property to set the GWT version -->
-		<gwtVersion>2.5.1</gwtVersion>
+		<gwtVersion>2.7.0</gwtVersion>
 		<distroDirectory>distro</distroDirectory>
 		<!-- GWT needs at least java 1.6 -->
 		<maven.compiler.source>1.7</maven.compiler.source>
@@ -48,6 +48,7 @@
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-user</artifactId>
+			<version>${gwtVersion}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
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;
+		}			
+	}
 }