From 3aa85cd588b745fb2537dbe748580d9c3b980133 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 8 Sep 2015 17:38:07 +0200
Subject: Compilable...

---
 .../org/openslx/imagemaster/session/Session.java     | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'src/main/java/org/openslx/imagemaster/session/Session.java')

diff --git a/src/main/java/org/openslx/imagemaster/session/Session.java b/src/main/java/org/openslx/imagemaster/session/Session.java
index f91a3ae..ed36274 100644
--- a/src/main/java/org/openslx/imagemaster/session/Session.java
+++ b/src/main/java/org/openslx/imagemaster/session/Session.java
@@ -1,5 +1,6 @@
 package org.openslx.imagemaster.session;
 
+import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.imagemaster.Globals;
 
 /**
@@ -12,9 +13,9 @@ public class Session
 	private static final long TIMEOUT = Long.valueOf( Globals.getSessionTimeoutUser() ) * 1000L;
 
 	private long timeOut = 0;
-	private final User user;
+	private final UserInfo user;
 
-	public Session(final User dbuser)
+	public Session( final UserInfo dbuser )
 	{
 		this.user = dbuser;
 		this.timeOut = System.currentTimeMillis() + TIMEOUT;
@@ -29,17 +30,17 @@ public class Session
 
 	public synchronized boolean timedOut()
 	{
-		return System.currentTimeMillis() > this.timeOut;
+		return this.timeOut == 0 || System.currentTimeMillis() > this.timeOut;
 	}
 
-	public String getSatelliteAddress()
+	public synchronized void invalidate()
 	{
-		return user.satelliteAddress;
+		this.timeOut = 0;
 	}
 
 	public String getLogin()
 	{
-		return user.login;
+		return user.userId;
 	}
 
 	public String getFirstName()
@@ -56,10 +57,15 @@ public class Session
 	{
 		return user.eMail;
 	}
-	
+
 	public String getOrgenizationId()
 	{
 		return user.organizationId;
 	}
 
+	public UserInfo getUserInfo()
+	{
+		return user;
+	}
+
 }
-- 
cgit v1.2.3-55-g7522