Fix breaking logic around getFilename() call

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3816 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.core/src/main/java/org/springframework/core/io/support/PropertiesLoaderSupport.java

@@ -180,11 +180,10 @@ public abstract class PropertiesLoaderSupport {
 				try {
 					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 {
 						if (this.fileEncoding != null) {