From 53180227dd44d6b8f766e421a49be1fec6bdcafc Mon Sep 17 00:00:00 2001
From: Michael Simon <simon@kit.edu>
Date: Thu, 25 Mar 2021 10:29:08 +0100
Subject: [PATCH] possible NPE with variable
---
.../main/java/edu/kit/scc/webreg/bean/DiscoveryLoginBean.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/DiscoveryLoginBean.java b/bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/DiscoveryLoginBean.java
index 748fe1886..a79c7e016 100644
--- a/bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/DiscoveryLoginBean.java
+++ b/bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/DiscoveryLoginBean.java
@@ -138,6 +138,8 @@ public class DiscoveryLoginBean implements Serializable {
}
if (! initialized) {
+ storeIdpSelection = false;
+
federationList = federationBean.getFederationList();
if (federationList == null || federationList.size() == 0) {
messageGenerator.addErrorMessage("Das SAML Subsystem ist noch nicht konfiguriert");
@@ -174,7 +176,7 @@ public class DiscoveryLoginBean implements Serializable {
sessionManager.setSpId(spConfig.getId());
sessionManager.setIdpId(selectedIdp.getId());
- if (storeIdpSelection) {
+ if (storeIdpSelection != null && storeIdpSelection) {
cookieHelper.setCookie("preselect_idp", selectedIdp.getId().toString(), 356 * 24 * 3600);
}
else {
--
GitLab