diff options
| author | Simon Rettberg | 2014-04-24 18:59:35 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-04-24 18:59:35 +0200 |
| commit | ed787b6f67954faab790cab107503eac8e6aad3c (patch) | |
| tree | 6f05300170e670ab5db0ccda62bb918d0371b7ad /src/main/java/org/openslx/imagemaster/session/Session.java | |
| parent | Fix name of format style (diff) | |
| parent | Add FTPS to MasterFtpServer (diff) | |
| download | masterserver-ed787b6f67954faab790cab107503eac8e6aad3c.tar.gz masterserver-ed787b6f67954faab790cab107503eac8e6aad3c.tar.xz masterserver-ed787b6f67954faab790cab107503eac8e6aad3c.zip | |
Merge branch 'master' of dnbd3:bwlp/masterserver
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/session/Session.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/session/Session.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/openslx/imagemaster/session/Session.java b/src/main/java/org/openslx/imagemaster/session/Session.java index 8dc7f2b..39861a1 100644 --- a/src/main/java/org/openslx/imagemaster/session/Session.java +++ b/src/main/java/org/openslx/imagemaster/session/Session.java @@ -1,5 +1,8 @@ package org.openslx.imagemaster.session; +import org.openslx.imagemaster.Globals; +import org.openslx.imagemaster.Globals.PropInt; + /** * Simple representation of a user session. Contains user-related data and * information on whether the session is still valid. @@ -7,7 +10,7 @@ package org.openslx.imagemaster.session; */ public class Session { - private static final long TIMEOUT = 600L * 1000L; // TODO: config + private static final long TIMEOUT = Long.valueOf( Globals.getPropertyInt( PropInt.SESSIONTIMEOUTUSER ) ) * 1000L; private long timeOut = 0; private final User user; |