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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov 18 14:30:01 2014
New Revision: 6933

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6933&view=rev
Log:
Adjust order/level of logging.

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

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/WriteProfileInterceptorResultToStorage.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/WriteProfileInterceptorResultToStorage.java?rev=6933&r1=6932&r2=6933&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/WriteProfileInterceptorResultToStorage.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/WriteProfileInterceptorResultToStorage.java Tue Nov 18 14:30:01 2014
@@ -59,19 +59,11 @@
     @Override protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext,
             @Nonnull final ProfileInterceptorContext interceptorContext) {
 
-        // TODO build some event when required data is missing ?
-
-        flowDescriptor = interceptorContext.getAttemptedFlow();
-        if (flowDescriptor == null) {
-            log.debug("{} No flow descriptor within interceptor context", getLogPrefix());
+        if (!super.doPreExecute(profileRequestContext, interceptorContext)) {
             return false;
         }
-
-        storageService = flowDescriptor.getStorageService();
-        if (storageService == null) {
-            log.debug("{} No storage service available from interceptor flow descriptor", getLogPrefix());
-            return false;
-        }
+        
+        // TODO build some event when required data is missing ?
 
         results = interceptorContext.getResults();
         if (results.isEmpty()) {
@@ -79,7 +71,19 @@
             return false;
         }
 
-        return super.doPreExecute(profileRequestContext, interceptorContext);
+        flowDescriptor = interceptorContext.getAttemptedFlow();
+        if (flowDescriptor == null) {
+            log.warn("{} No flow descriptor within interceptor context", getLogPrefix());
+            return false;
+        }
+
+        storageService = flowDescriptor.getStorageService();
+        if (storageService == null) {
+            log.warn("{} No storage service available from interceptor flow descriptor", getLogPrefix());
+            return false;
+        }
+
+        return true;
     }
 
     /** {@inheritDoc} */