1 files changed, 7 insertions, 7 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetAuthenticationDataService.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetAuthenticationDataService.java
index 66861afa3..2b4aaf458 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetAuthenticationDataService.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetAuthenticationDataService.java
@@ -56,6 +56,7 @@ import org.w3c.dom.NodeList;
 import at.gv.egovernment.moa.id.auth.builder.SAMLResponseBuilder;
 import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.util.ErrorResponseUtils;
 import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
 import at.gv.egovernment.moa.id.util.Random;
 import at.gv.egovernment.moa.util.Constants;
@@ -148,20 +149,19 @@ public class GetAuthenticationDataService implements Constants {
 					
 						try {
 							Throwable error = saml1server.getErrorResponse(samlArtifact);
-							statusCode = "samlp:RequestDenied";
+							statusCode = "samlp:Responder";
+							
+							ErrorResponseUtils errorUtils = ErrorResponseUtils.getInstance();
 							
 							if (error instanceof MOAIDException) {
 								statusMessageCode = ((MOAIDException)error).getMessageId();
-								subStatusCode = statusMessageCode;
 								statusMessage = StringEscapeUtils.escapeXml(((MOAIDException)error).getMessage());
 								
 							} else {
 								statusMessage = StringEscapeUtils.escapeXml(error.getMessage());
-								subStatusCode = "9999";
-							}
-							
-							
-									
+							}							
+							subStatusCode = errorUtils.getResponseErrorCode(error);
+																
 						} catch (Exception e) {
 							//no authentication data for given SAML artifact
 							statusCode = "samlp:Requester";