1 files changed, 17 insertions, 11 deletions
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 42501b4d1..10ebbe112 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
@@ -43,11 +43,11 @@ public class OASTORKConfig {
 
 				// prepare attribute helper list
 				attributes = new ArrayList<AttributeHelper>();
-				for(StorkAttribute current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getRequestedAttributes()) {
+				for(StorkAttribute current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getAttributes()) {
 					AttributeHelper tmp = null;
 
-					for(OAStorkAttribute sepp : config.getAttributes())
-						if(sepp.getAttribute().equals(current))
+					for(OAStorkAttribute sepp : config.getOAAttributes())
+						if(sepp.getName().equals(current.getName()))
 							tmp = new AttributeHelper(sepp);
 
 					if(null == tmp)
@@ -77,15 +77,21 @@ public class OASTORKConfig {
 
 	public List<OAStorkAttribute> getAttributes() {
 		List<OAStorkAttribute> result = new ArrayList<OAStorkAttribute>();
+
+		if(null == getHelperAttributes())
+			return result;
+
 		for(AttributeHelper current : getHelperAttributes()) {
-			if(current.isUsed()) {
-				OAStorkAttribute tmp = new OAStorkAttribute();
-				for(StorkAttribute currentAttribute : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getRequestedAttributes())
-					if(currentAttribute.getName().equals(current.getName()))
-						tmp.setAttribute(currentAttribute);
-				tmp.setMandatory(current.isMandatory());
-				result.add(tmp);
-			}
+			for(StorkAttribute currentAttribute : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getAttributes())
+				if(currentAttribute.getName().equals(current.getName())) {
+					if(current.isUsed() || currentAttribute.isMandatory()) {
+						OAStorkAttribute tmp = new OAStorkAttribute();
+						tmp.setName(current.getName());
+						tmp.setMandatory(current.isMandatory());
+						result.add(tmp);
+					}
+					break;
+				}
 		}
 
 		return result;