[java-identity-provider COMMIT] /trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/ExtractActiveAu...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov 19 12:10:56 2013
New Revision: 4957

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4957&view=rev
Log:
Annotations.

Modified:
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/ExtractActiveAuthenticationResults.java

Modified: trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/ExtractActiveAuthenticationResults.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/ExtractActiveAuthenticationResults.java?rev=4957&r1=4956&r2=4957&view=diff
==============================================================================
--- trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/ExtractActiveAuthenticationResults.java (original)
+++ trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/ExtractActiveAuthenticationResults.java Tue Nov 19 12:10:56 2013
@@ -21,6 +21,7 @@
 import java.util.List;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import net.shibboleth.idp.authn.AbstractAuthenticationAction;
 import net.shibboleth.idp.authn.AuthenticationException;
@@ -47,16 +48,16 @@
 public class ExtractActiveAuthenticationResults extends AbstractAuthenticationAction {
 
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(ExtractActiveAuthenticationResults.class);
+    @Nonnull private final Logger log = LoggerFactory.getLogger(ExtractActiveAuthenticationResults.class);
 
     /** Session to copy results from. */
-    private IdPSession session;
+    @Nullable private IdPSession session;
     
     /** {@inheritDoc} */
     protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext,
             @Nonnull final AuthenticationContext authenticationContext) throws AuthenticationException {
 
-        SessionContext ctx = profileRequestContext.getSubcontext(SessionContext.class, false);
+        final SessionContext ctx = profileRequestContext.getSubcontext(SessionContext.class, false);
         if (ctx != null) {
             session = ctx.getIdPSession();
             if (session != null) {
@@ -71,7 +72,7 @@
     protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext,
             @Nonnull final AuthenticationContext authenticationContext) throws AuthenticationException {
 
-        List<AuthenticationResult> actives = new ArrayList();
+        List<AuthenticationResult> actives = new ArrayList<>();
         for (AuthenticationResult result : session.getAuthenticationResults()) {
             AuthenticationFlowDescriptor descriptor =
                     authenticationContext.getPotentialFlows().get(result.getAuthenticationFlowId());