first stable version that uses OpenSAML 3.x

1 files changed, 2 insertions, 17 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java
index 73a11c49..1994eba0 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java
@@ -32,7 +32,6 @@ import org.opensaml.saml.metadata.resolver.filter.FilterException;
 import org.opensaml.saml.metadata.resolver.filter.MetadataFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xml.sax.SAXException;
 
 public class SchemaValidationFilter implements MetadataFilter {
   private static final Logger log = LoggerFactory.getLogger(SchemaValidationFilter.class);
@@ -58,8 +57,6 @@ public class SchemaValidationFilter implements MetadataFilter {
   @Override
   public XMLObject filter(final XMLObject arg0) throws FilterException {
 
-    String errString = null;
-
     if (isActive) {
       try {
         final Schema test = schemaBuilder.getSAMLSchema();
@@ -68,15 +65,6 @@ public class SchemaValidationFilter implements MetadataFilter {
         val.validate(source);
         log.info("Metadata Schema validation check done OK");
 
-      } catch (final SAXException e) {
-        if (log.isDebugEnabled() || log.isTraceEnabled()) {
-          log.warn("Metadata Schema validation FAILED with exception:", e);
-        } else {
-          log.warn("Metadata Schema validation FAILED with message: " + e.getMessage());
-        }
-
-        errString = e.getMessage();
-
       } catch (final Exception e) {
         if (log.isDebugEnabled() || log.isTraceEnabled()) {
           log.warn("Metadata Schema validation FAILED with exception:", e);
@@ -84,13 +72,10 @@ public class SchemaValidationFilter implements MetadataFilter {
           log.warn("Metadata Schema validation FAILED with message: " + e.getMessage());
         }
 
-        errString = e.getMessage();
-
+        throw new FilterException(new SchemaValidationException("internal.pvp.03",
+            new Object[] { e.getMessage() }, e));
       }
 
-      throw new FilterException(new SchemaValidationException("pvp2.26",
-          new Object[] { "Metadata Schema validation FAILED with message: " + errString }));
-
     } else {
       log.info("Metadata Schema validation check is DEACTIVATED!");