Fix breaking logic around getFilename() call

master
Chris Beams 14 years ago
parent 1a7aebb0dd
commit f105670cec
  1. 5
      org.springframework.core/src/main/java/org/springframework/core/io/support/PropertiesLoaderSupport.java

@ -180,12 +180,11 @@ public abstract class PropertiesLoaderSupport {
try { try {
is = location.getInputStream(); is = location.getInputStream();
if (location instanceof AbstractFileResolvingResource) { String filename = (location instanceof AbstractFileResolvingResource) ?
String filename = location.getFilename(); location.getFilename() : null;
if (filename != null && filename.endsWith(XML_FILE_EXTENSION)) { if (filename != null && filename.endsWith(XML_FILE_EXTENSION)) {
this.propertiesPersister.loadFromXml(props, is); this.propertiesPersister.loadFromXml(props, is);
} }
}
else { else {
if (this.fileEncoding != null) { if (this.fileEncoding != null) {
this.propertiesPersister.load(props, new InputStreamReader(is, this.fileEncoding)); this.propertiesPersister.load(props, new InputStreamReader(is, this.fileEncoding));

Loading…
Cancel
Save