diff options
author | Simon Rettberg | 2015-09-08 17:38:07 +0200 |
---|---|---|
committer | Simon Rettberg | 2015-09-08 17:38:07 +0200 |
commit | 3aa85cd588b745fb2537dbe748580d9c3b980133 (patch) | |
tree | 42d2c622b089c40b856d9ef09ed50eaa68407b68 /src/main/java/org/openslx/imagemaster/serversession/ServerSession.java | |
parent | Start adapting to new DB/Thrift model (diff) | |
download | masterserver-3aa85cd588b745fb2537dbe748580d9c3b980133.tar.gz masterserver-3aa85cd588b745fb2537dbe748580d9c3b980133.tar.xz masterserver-3aa85cd588b745fb2537dbe748580d9c3b980133.zip |
Compilable...
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/serversession/ServerSession.java')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/serversession/ServerSession.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/org/openslx/imagemaster/serversession/ServerSession.java b/src/main/java/org/openslx/imagemaster/serversession/ServerSession.java index 28b143e..3b79c5d 100644 --- a/src/main/java/org/openslx/imagemaster/serversession/ServerSession.java +++ b/src/main/java/org/openslx/imagemaster/serversession/ServerSession.java @@ -1,6 +1,9 @@ package org.openslx.imagemaster.serversession; +import java.util.List; + import org.openslx.imagemaster.Globals; +import org.openslx.imagemaster.db.models.LocalSatellite; /** * Holds the session id of the server and manages the timeout. @@ -10,9 +13,9 @@ public class ServerSession private static final long TIMEOUT = Long.valueOf( Globals.getSessionTimeoutServer() ) * 1000L; private long timeOut = 0; - private final ServerUser serverUser; + private final LocalSatellite serverUser; - public ServerSession(final ServerUser serverUser) + public ServerSession(final LocalSatellite serverUser) { this.serverUser = serverUser; this.timeOut = System.currentTimeMillis() + TIMEOUT; @@ -30,13 +33,13 @@ public class ServerSession return System.currentTimeMillis() > this.timeOut; } - public String getOrganization() + public String getOrganizationId() { - return serverUser.organization; + return serverUser.organizationId; } - public String getAddress() + public List<String> getAddresses() { - return serverUser.address; + return serverUser.addresses; } } |