1 files changed, 5 insertions, 7 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/SAMLSignatureValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/SAMLSignatureValidator.java
index df0fec001..db1241e6f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/SAMLSignatureValidator.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/SAMLSignatureValidator.java
@@ -6,15 +6,14 @@ import org.opensaml.security.SAMLSignatureProfileValidator;
 import org.opensaml.xml.validation.ValidationException;
 
 import at.gv.egovernment.moa.id.MOAIDException;
-import at.gv.egovernment.moa.id.protocols.pvp2x.SAMLRequestNotSignedException;
+import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.SAMLRequestNotSignedException;
 
 public class SAMLSignatureValidator implements ISAMLValidator {
 
 	public void validateRequest(RequestAbstractType request)
 			throws MOAIDException {
 		if (request.getSignature() == null) {
-			throw new SAMLRequestNotSignedException("NOT SIGNED",
-					new Object[] {});
+			throw new SAMLRequestNotSignedException();
 		}
 
 		try {
@@ -22,15 +21,14 @@ public class SAMLSignatureValidator implements ISAMLValidator {
 			sigValidator.validate(request.getSignature());
 		} catch (ValidationException e) {
 			e.printStackTrace();
-			throw new MOAIDException("SIGNATURE VALIDATOR", new Object[] {});
+			throw new SAMLRequestNotSignedException(e);
 		}
 	}
 
 	public static void validateSignable(SignableSAMLObject signableObject)
 			throws MOAIDException {
 		if (signableObject.getSignature() == null) {
-			throw new SAMLRequestNotSignedException("NOT SIGNED",
-					new Object[] {});
+			throw new SAMLRequestNotSignedException();
 		}
 
 		try {
@@ -38,7 +36,7 @@ public class SAMLSignatureValidator implements ISAMLValidator {
 			sigValidator.validate(signableObject.getSignature());
 		} catch (ValidationException e) {
 			e.printStackTrace();
-			throw new MOAIDException("SIGNATURE VALIDATOR", new Object[] {});
+			throw new SAMLRequestNotSignedException(e);
 		}
 	}
 }