SWS-594 - SchemaCollection issue when XSD files are in the classpath, in different JAR artifacts

Author: poutsma

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

@@ -257,16 +257,14 @@ else if (StringUtils.hasLength(baseUri)) {
                         }
                     }
                     catch (IOException e) {
-                        // fall through to super.resolveEntity
+                        // fall through
                     }
                 }
-                else {
-                    // let's try and find it on the classpath, see SWS-362
-                    String classpathLocation = ResourceLoader.CLASSPATH_URL_PREFIX + "/" + schemaLocation;
-                    resource = resourceLoader.getResource(classpathLocation);
-                    if (resource.exists()) {
-                        return createInputSource(resource);
-                    }
+                // let's try and find it on the classpath, see SWS-362
+                String classpathLocation = ResourceLoader.CLASSPATH_URL_PREFIX + "/" + schemaLocation;
+                resource = resourceLoader.getResource(classpathLocation);
+                if (resource.exists()) {
+                    return createInputSource(resource);
                 }
             }
             return super.resolveEntity(namespace, schemaLocation, baseUri);