From d111d9a9a67f9ee4d9be65bf52001d326438d30e Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Thu, 19 Sep 2013 22:58:20 -0700 Subject: [PATCH] Ticket #362: Changes to make mjumper happy. --- .../net/basic/rest/auth/BasicTokenUserContextMap.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenUserContextMap.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenUserContextMap.java index 997343bbf..0629efdde 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenUserContextMap.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenUserContextMap.java @@ -52,7 +52,7 @@ public class BasicTokenUserContextMap implements TokenUserContextMap { private Map userContextMap = new HashMap(); /** - * 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; + } /**