root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity

fix to resource handling in PluggableSchemaResolver

This commit is contained in:
Rob Harrop 2009-09-08 08:37:10 +00:00
parent 6651ff0c55
commit ae461db82a
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
View File

@ -17,6 +17,7 @@
package org.springframework.beans.factory.xml; package org.springframework.beans.factory.xml;
import java.io.IOException; import java.io.IOException;
import java.io.FileNotFoundException;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -99,16 +100,17 @@ public class PluggableSchemaResolver implements EntityResolver {
this.schemaMappingsLocation = schemaMappingsLocation; this.schemaMappingsLocation = schemaMappingsLocation;
} }
public InputSource resolveEntity(String publicId, String systemId) throws IOException { public InputSource resolveEntity(String publicId, String systemId) throws IOException {
if (logger.isTraceEnabled()) { if (logger.isTraceEnabled()) {
logger.trace("Trying to resolve XML entity with public id [" + publicId + logger.trace("Trying to resolve XML entity with public id [" + publicId +
"] and system id [" + systemId + "]"); "] and system id [" + systemId + "]");
} }
if (systemId != null) { if (systemId != null) {
String resourceLocation = getSchemaMappings().get(systemId); String resourceLocation = getSchemaMappings().get(systemId);
if (resourceLocation != null) { if (resourceLocation != null) {
Resource resource = new ClassPathResource(resourceLocation, this.classLoader); Resource resource = new ClassPathResource(resourceLocation, this.classLoader);
try {
InputSource source = new InputSource(resource.getInputStream()); InputSource source = new InputSource(resource.getInputStream());
source.setPublicId(publicId); source.setPublicId(publicId);
source.setSystemId(systemId); source.setSystemId(systemId);
@ -117,6 +119,12 @@ public class PluggableSchemaResolver implements EntityResolver {
} }
return source; return source;
} }
catch (FileNotFoundException ex) {
if (logger.isDebugEnabled()) {
logger.debug("Couldn't find XML schema [" + systemId + "]: " + resource, ex);
}
}
}
} }
return null; return null;
} }