[java-identity-provider COMMIT] /trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/AbstractCons...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Nov 19 21:56:06 2014
New Revision: 6955

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6955&view=rev
Log:
Revert errant refactoring.

Modified:
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/AbstractConsentStorageAction.java

Modified: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/AbstractConsentStorageAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/AbstractConsentStorageAction.java?rev=6955&r1=6954&r2=6955&view=diff
==============================================================================
--- trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/AbstractConsentStorageAction.java (original)
+++ trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/AbstractConsentStorageAction.java Wed Nov 19 21:56:06 2014
@@ -114,9 +114,9 @@
     }
 
     /**
-     * Set the storage storageContext lookup strategy.
-     * 
-     * @param strategy the storage storageContext lookup strategy
+     * Set the storage context lookup strategy.
+     * 
+     * @param strategy the storage context lookup strategy
      */
     public void setStorageContextLookupStrategy(@Nonnull final Function<ProfileRequestContext, String> strategy) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
@@ -125,9 +125,9 @@
     }
 
     /**
-     * Set the storage storageKey lookup strategy.
-     * 
-     * @param strategy the storage storageKey lookup strategy
+     * Set the storage key lookup strategy.
+     * 
+     * @param strategy the storage key lookup strategy
      */
     public void setStorageKeyLookupStrategy(@Nonnull final Function<ProfileRequestContext, String> strategy) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
@@ -194,8 +194,6 @@
     @Override protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext,
             @Nonnull final ProfileInterceptorContext interceptorContext) {
 
-        // TODO build some event when required data is missing ?
-
         if (!super.doPreExecute(profileRequestContext, interceptorContext)) {
             return false;
         }
@@ -203,7 +201,7 @@
         final ProfileInterceptorFlowDescriptor flowDescriptor = interceptorContext.getAttemptedFlow();
         log.trace("{} Flow descriptor '{}'", getLogPrefix(), flowDescriptor);
         if (flowDescriptor == null) {
-            log.debug("{} No flow descriptor available from interceptor storageContext", getLogPrefix());
+            log.warn("{} No flow descriptor available from interceptor context", getLogPrefix());
             return false;
         }