[java-identity-provider] branch master updated: Fix NPE in log statement.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=42ec2b5126af5a926fc64d8eefcc3fb09ae9250a

The following commit(s) were added to refs/heads/master by this push:
       new  42ec2b5   Fix NPE in log statement.
42ec2b5 is described below

commit 42ec2b5126af5a926fc64d8eefcc3fb09ae9250a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Nov 21 14:43:21 2019 -0500

    Fix NPE in log statement.
---
 .../net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java
index ff4e646..db0a41b 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java
@@ -499,8 +499,10 @@ public class SelectAuthenticationFlow extends AbstractAuthenticationAction {
                         final AuthenticationResult result = activeResults.get(descriptor.getId());
                         if (result == null || !result.getReuseCondition().test(profileRequestContext)
                                 || !predicate.test(result)) {
-                            log.debug("{} Active result for flow {} not usable, ignoring", getLogPrefix(),
-                                    result.getAuthenticationFlowId());
+                            if (result != null) {
+                                log.debug("{} Active result for flow {} not usable, ignoring", getLogPrefix(),
+                                        result.getAuthenticationFlowId());
+                            }
                             if (!authenticationContext.isPassive() || descriptor.isPassiveAuthenticationSupported()) {
                                 selectInactiveFlow(profileRequestContext, authenticationContext, descriptor);
                                 return;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.