Fix breaking logic around getFilename() call

14 years ago · f105670cec
parent 1a7aebb0dd
commit f105670cec
1 changed files with 4 additions and 5 deletions
--- a/org.springframework.core/src/main/java/org/springframework/core/io/support/PropertiesLoaderSupport.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/io/support/PropertiesLoaderSupport.java
@ -180,12 +180,11 @@ public abstract class PropertiesLoaderSupport {
 				try {
 					is = location.getInputStream();

-					if (location instanceof AbstractFileResolvingResource) {
-						String filename = location.getFilename();
+					String filename = (location instanceof AbstractFileResolvingResource) ?
+							location.getFilename() : null;
 					if (filename != null && filename.endsWith(XML_FILE_EXTENSION)) {
 						this.propertiesPersister.loadFromXml(props, is);
 					}
-					}
 					else {
 						if (this.fileEncoding != null) {
 							this.propertiesPersister.load(props, new InputStreamReader(is, this.fileEncoding));