1 files changed, 10 insertions, 9 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateReferenceValueAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateReferenceValueAttributeBuilder.java
index 5a50473d3..46c6ffb78 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateReferenceValueAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateReferenceValueAttributeBuilder.java
@@ -20,17 +20,18 @@ public class MandateReferenceValueAttributeBuilder extends BaseAttributeBuilder
 	public Attribute build(AuthenticationSession authSession, 
 			OAAuthParameter oaParam, AuthenticationData authData) throws PVP2Exception {
 		if(authSession.getUseMandate()) {
-			Element mandate = authSession.getMandate();
-			if(mandate == null) {
-				throw new NoMandateDataAvailableException();
-			}
-			Mandate mandateObject = MandateBuilder.buildMandate(mandate);
-			if(mandateObject == null) {
-				throw new NoMandateDataAvailableException();
-			}
+			
+//			Element mandate = authSession.getMandate();
+//			if(mandate == null) {
+//				throw new NoMandateDataAvailableException();
+//			}
+//			Mandate mandateObject = MandateBuilder.buildMandate(mandate);
+//			if(mandateObject == null) {
+//				throw new NoMandateDataAvailableException();
+//			}
 			
 			return buildStringAttribute(MANDATE_REFERENCE_VALUE_FRIENDLY_NAME, 
-					MANDATE_REFERENCE_VALUE_NAME, mandateObject.getMandateID());
+					MANDATE_REFERENCE_VALUE_NAME, authSession.getMandateReferenceValue());
 		}
 		return null;