1 files changed, 7 insertions, 5 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/MetaDataVerificationFilter.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/MetaDataVerificationFilter.java
index 7bf2cf93f..104ea51f5 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/MetaDataVerificationFilter.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/MetaDataVerificationFilter.java
@@ -32,6 +32,7 @@ import org.opensaml.xml.XMLObject;
 import org.opensaml.xml.security.x509.BasicX509Credential;
 
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.filter.SignatureValidationException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.verification.EntityVerifier;
 
 public class MetaDataVerificationFilter implements MetadataFilter {
@@ -43,17 +44,18 @@ public class MetaDataVerificationFilter implements MetadataFilter {
 	}
 	
 	
-	public void doFilter(XMLObject metadata) throws FilterException {
+	public void doFilter(XMLObject metadata) throws SignatureValidationException {
+		
 		if (metadata instanceof EntitiesDescriptor) {
 			EntitiesDescriptor entitiesDescriptor = (EntitiesDescriptor) metadata;
 			if(entitiesDescriptor.getSignature() == null) {
-				throw new FilterException("Root element of metadata file has to be signed", null);
+				throw new SignatureValidationException("Root element of metadata file has to be signed");
 			}
 			try {
 				processEntitiesDescriptor(entitiesDescriptor);
 				
 			} catch (MOAIDException e) {
-				throw new FilterException("Invalid Metadata file Root element is no EntitiesDescriptor", null);
+				throw new SignatureValidationException("Invalid signature element in EntitiesDescriptor");
 			}
 			
 		} if (metadata instanceof EntityDescriptor) {									
@@ -63,10 +65,10 @@ public class MetaDataVerificationFilter implements MetadataFilter {
 					EntityVerifier.verify(entity, this.credential);
 				
 				else
-					throw new FilterException("Root element of metadata file has to be signed", null);
+					throw new SignatureValidationException("Root element of metadata file has to be signed", null);
 				
 			} catch (MOAIDException e) {
-				throw new FilterException("Invalid Metadata file Root element is no EntitiesDescriptor", null);
+				throw new SignatureValidationException("Invalid signature element in EntityDescriptor", null);
 			}				
 		}
 	}