Author: ate
Date: Wed Jan 12 16:13:47 2011
New Revision: 1058217
URL: http://svn.apache.org/viewvc?rev=1058217&view=rev
Log:
JS2-1231: minor improvements to prevent unneeded recreation of session after
login if the session was new already
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/session/
(props changed)
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/login/filter/PortalFilter.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethPortalFilter.java
Propchange:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/session/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jan 12 16:13:47 2011
@@ -1,2 +1,2 @@
-target
+target
surefire*.properties
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/login/filter/PortalFilter.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/login/filter/PortalFilter.java?rev=1058217&r1=1058216&r2=1058217&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/login/filter/PortalFilter.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/login/filter/PortalFilter.java
Wed Jan 12 16:13:47 2011
@@ -91,7 +91,7 @@ public class PortalFilter implements Fil
audit.logUserActivity(username, request.getRemoteAddr(),
AuditActivity.AUTHENTICATION_SUCCESS, "PortalFilter");
PortalAuthenticationConfiguration
authenticationConfiguration = (PortalAuthenticationConfiguration)
cm.getComponent("org.apache.jetspeed.administration.PortalAuthenticationConfiguration");
- if
(authenticationConfiguration.isCreateNewSessionOnLogin())
+ if
(authenticationConfiguration.isCreateNewSessionOnLogin() && httpSession != null
&& !httpSession.isNew())
{
request.getSession().invalidate();
}
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethPortalFilter.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethPortalFilter.java?rev=1058217&r1=1058216&r2=1058217&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethPortalFilter.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethPortalFilter.java
Wed Jan 12 16:13:47 2011
@@ -130,7 +130,7 @@ public class ShibbolethPortalFilter impl
audit.logUserActivity(username,
request.getRemoteAddr(), AuditActivity.AUTHENTICATION_SUCCESS,
"ShibbolethFilter");
PortalAuthenticationConfiguration
authenticationConfiguration = (PortalAuthenticationConfiguration)
cm.getComponent("org.apache.jetspeed.administration.PortalAuthenticationConfiguration");
- if
(authenticationConfiguration.isCreateNewSessionOnLogin())
+ if
(authenticationConfiguration.isCreateNewSessionOnLogin() && httpSession != null
&& !httpSession.isNew())
{
request.getSession().invalidate();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
