1 files changed, 23 insertions, 22 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/builder/attributes/MandateProfRepDescAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/builder/attributes/MandateProfRepDescAttributeBuilder.java
index e70326114..d1da36aa3 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/builder/attributes/MandateProfRepDescAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/builder/attributes/MandateProfRepDescAttributeBuilder.java
@@ -26,7 +26,6 @@ import org.w3c.dom.Element;
 
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters;
-import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.data.IAuthData;
 import at.gv.egovernment.moa.id.data.MISMandate;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
@@ -42,35 +41,37 @@ public class MandateProfRepDescAttributeBuilder implements IPVPAttributeBuilder
 
 	public <ATT> ATT build(IOAAuthParameters oaParam, IAuthData authData,
 			IAttributeGenerator<ATT> g) throws AttributeException {
-		if(authData.isUseMandate()) {
-			String text = null;
+		if(authData.isUseMandate()) {						
+			String profRepName = authData.getGenericData(MANDATE_PROF_REP_DESC_NAME, String.class);
 			
-			MISMandate misMandate = authData.getMISMandate();
-			
-			if(misMandate == null) {
-				throw new NoMandateDataAttributeException();
-			}
-		
-			text = misMandate.getTextualDescriptionOfOID();
-			
-			if (MiscUtil.isEmpty(text)) {			
-				Element mandate = authData.getMandate();
-				if (mandate == null) {
+			if (MiscUtil.isEmpty(profRepName)) {			
+				MISMandate misMandate = authData.getMISMandate();
+				
+				if(misMandate == null) {
 					throw new NoMandateDataAttributeException();
 				}
 			
-				Mandate mandateObject = MandateBuilder.buildMandate(authData.getMandate());
-				if (mandateObject == null) {
-					throw new NoMandateDataAttributeException();
-				}
-
-				text = mandateObject.getAnnotation();
+				profRepName = misMandate.getTextualDescriptionOfOID();
+				
+				if (MiscUtil.isEmpty(profRepName)) {			
+					Element mandate = authData.getMandate();
+					if (mandate == null) {
+						throw new NoMandateDataAttributeException();
+					}
 				
+					Mandate mandateObject = MandateBuilder.buildMandate(authData.getMandate());
+					if (mandateObject == null) {
+						throw new NoMandateDataAttributeException();
+					}
+	
+					profRepName = mandateObject.getAnnotation();
+					
+				}
 			}
 			
-			if(MiscUtil.isNotEmpty(text)) 
+			if(MiscUtil.isNotEmpty(profRepName)) 
 				return g.buildStringAttribute(MANDATE_PROF_REP_DESC_FRIENDLY_NAME, 
-						MANDATE_PROF_REP_DESC_NAME, text);
+						MANDATE_PROF_REP_DESC_NAME, profRepName);
 										
 		}
 		return null;