[java-identity-provider COMMIT] /trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicali...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Jan 11 11:46:55 2014
New Revision: 5181

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5181&view=rev
Log:
Bring related methods together for easier review

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java?rev=5181&r1=5180&r2=5181&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java Sat Jan 11 11:46:55 2014
@@ -158,6 +158,7 @@
     }
     
     /** {@inheritDoc} */
+    @Override
     protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext) throws ProfileException {
         scContext = scCtxLookupStrategy.apply(profileRequestContext);
         if (scContext == null) {
@@ -172,12 +173,6 @@
         }
     }
 
-    /** {@inheritDoc} */
-    protected final void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) throws ProfileException {
-
-        doExecute(profileRequestContext, scContext);
-    }
-
     /**
      * Performs this c14n action's pre-execute step. Default implementation just returns true iff a subject
      * is set.
@@ -194,6 +189,13 @@
         return c14nContext.getSubject() != null;
     }
     
+    /** {@inheritDoc} */
+    @Override
+    protected final void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) throws ProfileException {
+
+        doExecute(profileRequestContext, scContext);
+    }
+
     /**
      * Performs this authentication action. Default implementation throws an exception.
      *