Author: mposolda Date: 2011-12-15 15:21:49 -0500 (Thu, 15 Dec 2011) New Revision: 8257 Modified: portal/trunk/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java Log: GTNPORTAL-2296 Incorrect portal container "portal" is bound to ExoContainerContext thread-local variable Modified: portal/trunk/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java =================================================================== --- portal/trunk/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2011-12-15 04:42:03 UTC (rev 8256) +++ portal/trunk/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2011-12-15 20:21:49 UTC (rev 8257) @@ -53,10 +53,6 @@ public static final String COOKIE_NAME = "rememberme"; /** . */ - public static final long LOGIN_VALIDITY = - 1000 * TicketConfiguration.getInstance(TicketConfiguration.class).getValidityTime(); - - /** . */ private WCIController wciController; /** . */ @@ -112,7 +108,7 @@ else { // WCI authentication - servletContainer.login(req, resp, credentials, LOGIN_VALIDITY, wciController.getInitialURI(req)); + servletContainer.login(req, resp, credentials, getLoginValidity(), wciController.getInitialURI(req)); } } @@ -158,4 +154,9 @@ } return wciController; } + + private long getLoginValidity() + { + return 1000 * TicketConfiguration.getInstance(TicketConfiguration.class).getValidityTime(); + } }