[java-opensaml COMMIT] /trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Nov  6 20:41:22 2015
New Revision: 4405

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4405&view=rev
Log:
OSJ-111: SAMLSchemaBuilder configures two SchemaBuilders if one is injected

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java?rev=4405&r1=4404&r2=4405&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java	(original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java	Fri Nov  6 20:41:22 2015
@@ -163,9 +163,6 @@
         } else {
             saml1xSchemas = saml10Schemas;
         }
-        schemaBuilder = new SchemaBuilder();
-        schemaBuilder.setResourceResolver(new ClasspathResolver());
-        configureBuilder();
     }
     
     /**
@@ -199,10 +196,16 @@
      */
     @Nonnull public synchronized Schema getSAMLSchema() throws SAXException {
         if (cachedSchema == null) {
+            if (schemaBuilder == null) {
+                schemaBuilder = new SchemaBuilder();
+                schemaBuilder.setResourceResolver(new ClasspathResolver());
+                configureBuilder();
+            }
             cachedSchema = schemaBuilder.buildSchema();
-        }
-
-        return cachedSchema;
+            return cachedSchema;
+        } else {
+            return cachedSchema;
+        }
     }
 
     /**