1 files changed, 13 insertions, 9 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 6dcc3234..73a11c49 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
@@ -23,20 +23,23 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.Validator;
 
-import org.opensaml.common.xml.SAMLSchemaBuilder;
-import org.opensaml.saml2.metadata.provider.FilterException;
-import org.opensaml.saml2.metadata.provider.MetadataFilter;
-import org.opensaml.xml.XMLObject;
+import at.gv.egiz.eaaf.modules.pvp2.exception.SchemaValidationException;
+
+import org.opensaml.core.xml.XMLObject;
+import org.opensaml.saml.common.xml.SAMLSchemaBuilder;
+import org.opensaml.saml.common.xml.SAMLSchemaBuilder.SAML1Version;
+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;
 
-import at.gv.egiz.eaaf.modules.pvp2.exception.SchemaValidationException;
-
 public class SchemaValidationFilter implements MetadataFilter {
   private static final Logger log = LoggerFactory.getLogger(SchemaValidationFilter.class);
   private boolean isActive = true;
 
+  private static SAMLSchemaBuilder schemaBuilder = new SAMLSchemaBuilder(SAML1Version.SAML_11);
+
   public SchemaValidationFilter() {
 
   }
@@ -53,18 +56,17 @@ public class SchemaValidationFilter implements MetadataFilter {
    * .XMLObject)
    */
   @Override
-  public void doFilter(final XMLObject arg0) throws FilterException {
+  public XMLObject filter(final XMLObject arg0) throws FilterException {
 
     String errString = null;
 
     if (isActive) {
       try {
-        final Schema test = SAMLSchemaBuilder.getSAML11Schema();
+        final Schema test = schemaBuilder.getSAMLSchema();
         final Validator val = test.newValidator();
         final DOMSource source = new DOMSource(arg0.getDOM());
         val.validate(source);
         log.info("Metadata Schema validation check done OK");
-        return;
 
       } catch (final SAXException e) {
         if (log.isDebugEnabled() || log.isTraceEnabled()) {
@@ -91,8 +93,10 @@ public class SchemaValidationFilter implements MetadataFilter {
 
     } else {
       log.info("Metadata Schema validation check is DEACTIVATED!");
+
     }
 
+    return arg0;
   }
 
 }