[java-identity-provider COMMIT] /trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/Sel...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Nov  2 21:36:21 2014
New Revision: 6821

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6821&view=rev
Log:
Fix log message.

Modified:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/SelectProfileInterceptorFlow.java

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/SelectProfileInterceptorFlow.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/SelectProfileInterceptorFlow.java?rev=6821&r1=6820&r2=6821&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/SelectProfileInterceptorFlow.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/SelectProfileInterceptorFlow.java Sun Nov  2 21:36:21 2014
@@ -55,16 +55,20 @@
     @Override protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext,
             @Nonnull final ProfileInterceptorContext interceptorContext) {
 
+        if (!super.doPreExecute(profileRequestContext, interceptorContext)) {
+            return false;
+        }
+        
         // Detect a previous attempted flow, and move it to the intermediate collection.
-        // This will prevent re-selecting the same (probably failed) flow again.
+        // This will prevent re-selecting the same flow again.
         if (interceptorContext.getAttemptedFlow() != null) {
-            log.info("{} Moving incomplete flow {} to intermediate set, reselecting a different one", getLogPrefix(),
+            log.info("{} Moving completed flow {} to intermediate set, selecting next one", getLogPrefix(),
                     interceptorContext.getAttemptedFlow().getId());
             interceptorContext.getIntermediateFlows().put(interceptorContext.getAttemptedFlow().getId(),
                     interceptorContext.getAttemptedFlow());
         }
 
-        return super.doPreExecute(profileRequestContext, interceptorContext);
+        return true;
     }
 
     /** {@inheritDoc} */