From 54144b697bd1a5c4b08e8da9fec655afd949446c Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 26 May 2014 14:47:36 +0200
Subject: fix different STORK bugs

---
 .../moa/id/configuration/data/oa/OASTORKConfig.java    | 12 +++++++++---
 .../id/configuration/struts/action/EditOAAction.java   | 18 +++++++++++++-----
 .../validation/oa/OAPVP2ConfigValidation.java          |  4 ++--
 .../egovernment/moa/id/config/stork/STORKConfig.java   |  5 +++--
 4 files changed, 27 insertions(+), 12 deletions(-)

(limited to 'id')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index be5b2200b..363c094ff 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -253,9 +253,15 @@ public class OASTORKConfig implements IOnlineApplicationData{
 	public List<CPEPS> getEnabledCPEPS() {
 		if (enabledCitizenCountries != null) {
 			List<CPEPS> result = new ArrayList<CPEPS>();
-			for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
-				if(enabledCitizenCountries.contains(current.getCountryCode()))
-					result.add(current);
+			
+			try {
+				for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
+					if(enabledCitizenCountries.contains(current.getCountryCode()))
+						result.add(current);
+				}
+				
+			} catch (NullPointerException e){
+				
 			}
 			return result;
 		}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index 659835d03..9509f9712 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -133,12 +133,20 @@ public class EditOAAction extends BasicOAAction {
 
 			// prepare attribute helper list
 			ArrayList<AttributeHelper> attributes = new ArrayList<AttributeHelper>();
-			for (StorkAttribute current : ConfigurationDBRead
-					.getMOAIDConfiguration().getAuthComponentGeneral()
-					.getForeignIdentities().getSTORK().getAttributes())
-				attributes.add(new AttributeHelper(current));
-			getStorkOA().setHelperAttributes(attributes);
+			
+			try {			
+				for (StorkAttribute current : ConfigurationDBRead
+						.getMOAIDConfiguration().getAuthComponentGeneral()
+						.getForeignIdentities().getSTORK().getAttributes())
+					attributes.add(new AttributeHelper(current));
+				
+				
+			} catch (NullPointerException e) {
+				
+			}
 
+			getStorkOA().setHelperAttributes(attributes);
+			
 		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
 
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
index 345d25cda..40e243d0b 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
@@ -121,10 +121,10 @@ public class OAPVP2ConfigValidation {
 											protoSocketFactory);
 	
 							} catch (MOAHttpProtocolSocketFactoryException e) {
-								log.warn("MOA SSL-TrustStore can not initialized. Use default Java TrustStore.");
+								log.warn("MOA SSL-TrustStore can not initialized. Use default Java TrustStore.", e);
 								
 							} catch (ConfigurationException e) {
-								log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.");
+								log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.", e);
 								
 							}
 						
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
index 4dec2c32e..2e243b3ae 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
@@ -70,7 +70,8 @@ public class STORKConfig {
 
         try {
             cpeps = stork.getCPEPS();
-        }   catch (NullPointerException ex) {
+            
+        }   catch (NullPointerException ex) {        	
             Logger.error("CPEPS not configured!");
         }
 
@@ -104,7 +105,7 @@ public class STORKConfig {
 			}*/
 		}
 		attr = new ArrayList<StorkAttribute>();
-		if (stork.getAttributes() != null) {
+		if (stork != null && stork.getAttributes() != null) {
 			for(StorkAttribute current : stork.getAttributes()) {
 				attr.add(current);
 			}
-- 
cgit v1.2.3