diff options
Diffstat (limited to 'id')
| -rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java | 23 | 
1 files changed, 13 insertions, 10 deletions
| 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 463930fd7..ff481b825 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 @@ -63,23 +63,26 @@ public class STORKConfig {  		cpepsMap = new HashMap<String, CPEPS>();
 -		for(at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS cpep : cpeps) {
 +		if (cpeps != null) {
 +			for(at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS cpep : cpeps) {
 -			try {
 -				CPEPS moacpep = new CPEPS(cpep.getCountryCode(), new URL(cpep.getURL()));
 +				try {
 +					CPEPS moacpep = new CPEPS(cpep.getCountryCode(), new URL(cpep.getURL()));
 -				cpepsMap.put(cpep.getCountryCode(), moacpep);
 +					cpepsMap.put(cpep.getCountryCode(), moacpep);
 -			} catch (MalformedURLException e) {
 -				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country "
 -						+ cpep.getCountryCode() + " has an invalid URL and is ignored.");
 +				} catch (MalformedURLException e) {
 +					Logger.warn("Error in MOA-ID Configuration. CPEP entry for country "
 +							+ cpep.getCountryCode() + " has an invalid URL and is ignored.");
 +				}
  			}
  		}
 -		
  		attr = new ArrayList<StorkAttribute>();
 -		for(StorkAttribute current : stork.getAttributes()) {
 -			attr.add(current);
 +		if (stork.getAttributes() != null) {
 +			for(StorkAttribute current : stork.getAttributes()) {
 +				attr.add(current);
 +			}
  		}
  	}
 | 
