[java-identity-provider COMMIT] in /trunk/idp-session-impl: pom.xml src/main/java/net/shibboleth/idp/session/impl/Pop...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb  3 21:04:27 2014
New Revision: 5307

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5307&view=rev
Log:
IDP-367: rebase actions on IdP base class

Modified:
    trunk/idp-session-impl/pom.xml
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateSessionContext.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSession.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/InvalidateSessionOnIdentitySwitchTest.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/PopulateSessionContextTest.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/UpdateSessionWithAuthenticationResultTest.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSessionTest.java

Modified: trunk/idp-session-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/pom.xml?rev=5307&r1=5306&r2=5307&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateSessionContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateSessionContext.java?rev=5307&r1=5306&r2=5307&view=diff
==============================================================================
--- trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateSessionContext.java (original)
+++ trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateSessionContext.java Mon Feb  3 21:04:27 2014
@@ -20,6 +20,7 @@
 import javax.annotation.Nonnull;
 import javax.servlet.http.HttpServletRequest;
 
+import net.shibboleth.idp.profile.AbstractProfileAction;
 import net.shibboleth.idp.session.IdPSession;
 import net.shibboleth.idp.session.SessionException;
 import net.shibboleth.idp.session.SessionResolver;
@@ -33,7 +34,6 @@
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
 import org.opensaml.profile.ProfileException;
-import org.opensaml.profile.action.AbstractProfileAction;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -112,7 +112,7 @@
                 return;
             }
             
-            HttpServletRequest request = getHttpServletRequest();
+            final HttpServletRequest request = getHttpServletRequest();
             if (request != null && request.getRemoteAddr() != null) {
                 if (!session.checkAddress(request.getRemoteAddr())) {
                     return;

Modified: trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSession.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSession.java?rev=5307&r1=5306&r2=5307&view=diff
==============================================================================
--- trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSession.java (original)
+++ trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSession.java Mon Feb  3 21:04:27 2014
@@ -20,6 +20,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.idp.profile.AbstractProfileAction;
 import net.shibboleth.idp.session.IdPSession;
 import net.shibboleth.idp.session.SPSession;
 import net.shibboleth.idp.session.SessionException;
@@ -33,7 +34,6 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.profile.ProfileException;
-import org.opensaml.profile.action.AbstractProfileAction;
 import org.opensaml.profile.action.ActionSupport;
 import org.opensaml.profile.action.EventIds;
 import org.opensaml.profile.context.ProfileRequestContext;
@@ -155,7 +155,8 @@
             sessionCtx = profileRequestContext.getSubcontext(SessionContext.class, false);
             
             // We can only do work if a session exists.
-            return sessionCtx != null && sessionCtx.getIdPSession() != null;
+            return sessionCtx != null && sessionCtx.getIdPSession() != null
+                    && super.doPreExecute(profileRequestContext);
         }
         
         return false;

Modified: trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/InvalidateSessionOnIdentitySwitchTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/InvalidateSessionOnIdentitySwitchTest.java?rev=5307&r1=5306&r2=5307&view=diff
==============================================================================
--- trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/InvalidateSessionOnIdentitySwitchTest.java (original)

[... 393 lines stripped ...]