From 191bd90971b488bff16a5e08d0c1b2306da5876f Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 14 Mar 2014 12:52:35 +0100
Subject: bugfix possible NullPointerException in STORK config

---
 .../moa/id/configuration/data/GeneralMOAIDConfig.java |  8 +++++++-
 .../struts/action/EditGeneralConfigAction.java        | 19 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

(limited to 'id/ConfigWebTool/src/main/java')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
index d6ede8fbf..a052f403b 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
@@ -55,6 +55,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.TransformsInfoType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.TrustAnchor;
 import at.gv.egovernment.moa.id.commons.db.dao.config.VerifyAuthBlock;
 import at.gv.egovernment.moa.id.commons.db.dao.config.VerifyIdentityLink;
+import at.gv.egovernment.moa.id.config.legacy.ConfigurationBuilder;
 import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.data.pvp2.ContactForm;
 import at.gv.egovernment.moa.util.MiscUtil;
@@ -305,7 +306,12 @@ public class GeneralMOAIDConfig {
 			if (modes != null) {
 				ChainingModeType defaultmode = modes.getSystemDefaultMode();
 				if (defaultmode != null) {
-					defaultchainigmode = defaultmode.value();
+					
+					if (ConfigurationBuilder.CM_CHAINING.equals(defaultmode.value()))
+						defaultchainigmode = ChainingModeType.CHAIN.value();
+					
+					else					
+						defaultchainigmode = defaultmode.value();
 					
 				}
 				
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
index 5df12a7a5..75e07a1a0 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
@@ -41,6 +41,7 @@ import org.apache.struts2.interceptor.ServletResponseAware;
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentGeneral;
+import at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS;
 import at.gv.egovernment.moa.id.commons.db.dao.config.ChainingModeType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.ChainingModes;
 import at.gv.egovernment.moa.id.commons.db.dao.config.ConnectionParameterClientAuthType;
@@ -62,6 +63,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.SLRequestTemplates;
 import at.gv.egovernment.moa.id.commons.db.dao.config.SSO;
 import at.gv.egovernment.moa.id.commons.db.dao.config.STORK;
 import at.gv.egovernment.moa.id.commons.db.dao.config.SecurityLayer;
+import at.gv.egovernment.moa.id.commons.db.dao.config.StorkAttribute;
 import at.gv.egovernment.moa.id.commons.db.dao.config.TimeOuts;
 import at.gv.egovernment.moa.id.commons.db.dao.config.TransformsInfoType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.TrustAnchor;
@@ -483,12 +485,23 @@ public class EditGeneralConfigAction extends ActionSupport
 			ForeignIdentities oldforeign = oldauth.getForeignIdentities();
 			if (oldforeign != null) {
 				STORK oldstork = oldforeign.getSTORK();
-				if (oldstork != null)
+				if (oldstork == null)
 					oldstork = new STORK();
 
 				oldstork.setQualityAuthenticationAssuranceLevel(storkconfig.getDefaultQaa());
-				oldstork.setAttributes(storkconfig.getAttributes());
-				oldstork.setCPEPS(storkconfig.getCpepslist());
+				
+				if (storkconfig.getAttributes() != null)
+					oldstork.setAttributes(storkconfig.getAttributes());
+				
+				else
+					oldstork.setAttributes((List<StorkAttribute>) (new ArrayList<StorkAttribute>()));
+				
+				if (storkconfig.getCpepslist() != null)
+					oldstork.setCPEPS(storkconfig.getCpepslist());
+				
+				else
+					oldstork.setCPEPS((List<CPEPS>) (new ArrayList<CPEPS>()));
+				
 				dbforeign.setSTORK(oldstork);
 			}
 		}
-- 
cgit v1.2.3