safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #362: Changes to make mjumper happy.

Browse Source
This commit is contained in:
James Muehlner
2013-09-19 22:58:20 -07:00
parent 873fd57e25
commit d111d9a9a6
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenUserContextMap.java
View File

@@ -52,7 +52,7 @@ public class BasicTokenUserContextMap implements TokenUserContextMap {
private Map<String, UserContext> userContextMap = new HashMap<String, UserContext>();
/**
* The session timeout configuration for an API session.
* The session timeout configuration for an API session, in milliseconds.
*/
private final long SESSION_TIMEOUT;
@@ -62,14 +62,17 @@ public class BasicTokenUserContextMap implements TokenUserContextMap {
public BasicTokenUserContextMap() {
// Set up the SESSION_TIMEOUT value, with a one hour default.
long sessionTimeoutValue = 3600000l;
long sessionTimeoutValue;
try {
sessionTimeoutValue = GuacamoleProperties.getProperty(BasicGuacamoleProperties.API_SESSION_TIMEOUT, 3600000l);
} catch (GuacamoleException e) {
logger.error("Unexpected GuacamoleException caught while reading API_SESSION_TIMEOUT property.", e);
}
catch (GuacamoleException e) {
logger.error("Unexpected GuacamoleException caught while reading API_SESSION_TIMEOUT property. Defaulting to 1 hour.", e);
sessionTimeoutValue = 3600000l;
}
SESSION_TIMEOUT = sessionTimeoutValue;
}
/**