[java-identity-provider COMMIT] in /trunk/idp-profile-impl/src: main/java/net/shibboleth/idp/profile/impl/CheckForPro...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Apr 30 14:21:10 2014
New Revision: 5810

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5810&view=rev
Log:
Fail silently if no context/config found.

Modified:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/CheckForProfileSubflow.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/CheckForProfileSubflowTest.java

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/CheckForProfileSubflow.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/CheckForProfileSubflow.java?rev=5810&r1=5809&r2=5810&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/CheckForProfileSubflow.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/CheckForProfileSubflow.java Wed Apr 30 14:21:10 2014
@@ -21,7 +21,6 @@
 import javax.annotation.Nullable;
 
 import net.shibboleth.idp.profile.AbstractProfileAction;
-import net.shibboleth.idp.profile.IdPEventIds;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -44,8 +43,6 @@
  * function, by default a child of the profile request context.</p>
  * 
  * @event {@link org.opensaml.profile.action.EventIds#PROCEED_EVENT_ID}
- * @event {@link IdPEventIds#INVALID_RELYING_PARTY_CTX}
- * @event {@link IdPEventIds#INVALID_PROFILE_CONFIG}
  * @event subflow ID
  */
 public class CheckForProfileSubflow extends AbstractProfileAction {
@@ -121,13 +118,11 @@
         rpCtx = relyingPartyContextLookupStrategy.apply(profileRequestContext);
         if (rpCtx == null) {
             log.debug("{} No relying party context associated with this profile request", getLogPrefix());
-            ActionSupport.buildEvent(profileRequestContext, IdPEventIds.INVALID_RELYING_PARTY_CTX);
             return false;
         }
 
         if (rpCtx.getProfileConfig() == null) {
             log.debug("{} No profile configuration associated with this profile request", getLogPrefix());
-            ActionSupport.buildEvent(profileRequestContext, IdPEventIds.INVALID_PROFILE_CONFIG);
             return false;
         }
         

Modified: trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/CheckForProfileSubflowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/CheckForProfileSubflowTest.java?rev=5810&r1=5809&r2=5810&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/CheckForProfileSubflowTest.java (original)
+++ trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/CheckForProfileSubflowTest.java Wed Apr 30 14:21:10 2014
@@ -18,7 +18,6 @@
 package net.shibboleth.idp.profile.impl;
 
 import net.shibboleth.idp.profile.ActionTestingSupport;
-import net.shibboleth.idp.profile.IdPEventIds;
 
 import org.opensaml.profile.context.ProfileRequestContext;
 
@@ -57,7 +56,7 @@
         action.initialize();
         
         final Event event = action.execute(src);
-        ActionTestingSupport.assertEvent(event, IdPEventIds.INVALID_RELYING_PARTY_CTX);
+        ActionTestingSupport.assertProceedEvent(event);
     }
 
     @Test public void testNoProfileConfiguration() throws Exception {
@@ -66,7 +65,7 @@
         action.initialize();
         
         final Event event = action.execute(src);
-        ActionTestingSupport.assertEvent(event, IdPEventIds.INVALID_PROFILE_CONFIG);
+        ActionTestingSupport.assertProceedEvent(event);
     }
 
     @Test public void testNoFlow() throws Exception {