1 files changed, 17 insertions, 6 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java
index 980aa4731..3354fd708 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralStorkConfig.java
@@ -31,14 +31,18 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.ForeignIdentities;
 import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration;
 import at.gv.egovernment.moa.id.commons.db.dao.config.STORK;
 import at.gv.egovernment.moa.id.commons.db.dao.config.StorkAttribute;
+import org.apache.log4j.Logger;
 
 public class GeneralStorkConfig {
 
 	private List<CPEPS> cpepslist;
 	private List<StorkAttribute> attributes;
 	private int qaa;
+    private static final Logger log = Logger.getLogger(GeneralStorkConfig.class);
+
+    public void parse(MOAIDConfiguration config) {
+        log.error("STARTED STORK CONFIG");
 
-	public void parse(MOAIDConfiguration config) {
 
 		if (config != null) {
 			AuthComponentGeneral auth = config.getAuthComponentGeneral();
@@ -48,22 +52,23 @@ public class GeneralStorkConfig {
 
 				if (foreign != null) {
 					STORK stork = foreign.getSTORK();
+					cpepslist = new ArrayList<CPEPS>();
+					attributes = new ArrayList<StorkAttribute>();
+					
 					if (stork != null) {
 						// deep clone all the things
 						// to foreclose lazyloading session timeouts
-						cpepslist = new ArrayList<CPEPS>();
+						
 						for(CPEPS current : stork.getCPEPS()) {
 							cpepslist.add(current);
 						}
-
+						
 						List<StorkAttribute> tmp = stork.getAttributes();
 						if(null != tmp) {
-							attributes = new ArrayList<StorkAttribute>();
+							
 							for(StorkAttribute current : tmp)
 								attributes.add(current);
 						}
-						if(attributes.isEmpty())
-							attributes.add(new StorkAttribute());
 
 						try {
 							qaa = stork.getQualityAuthenticationAssuranceLevel();
@@ -71,6 +76,12 @@ public class GeneralStorkConfig {
 							qaa = 4;
 						}
 					}
+					
+					if (cpepslist.isEmpty())
+						cpepslist.add(new CPEPS());
+					
+					if(attributes.isEmpty())
+						attributes.add(new StorkAttribute());
 				}
 			}
 		}