SWS-409

Author: poutsma

xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java

@@ -143,13 +143,18 @@ public void afterPropertiesSet() throws IOException {
         for (int i = 0; i < xsdResources.length; i++) {
             Resource xsdResource = xsdResources[i];
             Assert.isTrue(xsdResource.exists(), xsdResource + " does not exit");
-            XmlSchema xmlSchema = schemaCollection
-                    .read(SaxUtils.createInputSource(xsdResource), validationEventHandler);
-            xmlSchemas.add(xmlSchema);
+            try {
+                XmlSchema xmlSchema = schemaCollection
+                        .read(SaxUtils.createInputSource(xsdResource), validationEventHandler);
+                xmlSchemas.add(xmlSchema);
 
-            if (inline) {
-                inlineIncludes(xmlSchema, processedIncludes, processedImports);
-                findImports(xmlSchema, processedImports, processedIncludes);
+                if (inline) {
+                    inlineIncludes(xmlSchema, processedIncludes, processedImports);
+                    findImports(xmlSchema, processedImports, processedIncludes);
+                }
+            }
+            catch (Exception ex) {
+                throw new CommonsXsdSchemaException("Schema [" + xsdResource + "] could not be loaded", ex);
             }
         }
         if (logger.isInfoEnabled()) {

xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java

@@ -108,4 +108,16 @@ public void testCreateValidator() throws Exception {
         XmlValidator validator = collection.createValidator();
         assertNotNull("No XmlValidator returned", validator);
     }
+
+    public void testInvalidSchema() throws Exception {
+        Resource invalid = new ClassPathResource("invalid.xsd", AbstractXsdSchemaTestCase.class);
+        collection.setXsds(new Resource[]{invalid});
+        try {
+            collection.afterPropertiesSet();
+            fail("CommonsXsdSchemaException expected");
+        }
+        catch (CommonsXsdSchemaException ex) {
+            // expected
+        }
+    }
 }

xml/src/test/resources/org/springframework/xml/xsd/invalid.xsd

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            targetNamespace="urn:1"
+            xmlns="urn:1"
+            xmlns:imported="urn:2" elementFormDefault="qualified">
+    <xsd:include schemaLocation="X.xsd"/>
+    <!--<xsd:import schemaLocation="D.xsd" namespace="urn:2"/>-->
+    <xsd:complexType name="B">
+        <xsd:sequence>
+            <xsd:element type="C" name="c"/>
+            <xsd:element type="imported:D" name="d"/>
+        </xsd:sequence>
+    </xsd:complexType>
+</xsd:schema>