Log4jConfigurer initLogging(location) throws FileNotFoundException for file URL as well

Issue: SPR-9725

Author: jhoeller

spring-core/src/main/java/org/springframework/util/Log4jConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,8 +35,7 @@
  * <p>For web environments, the analogous Log4jWebConfigurer class can be found
  * in the web package, reading in its configuration from context-params in
  * {@code web.xml}. In a J2EE web application, log4j is usually set up
- * via Log4jConfigListener or Log4jConfigServlet, delegating to
- * Log4jWebConfigurer underneath.
+ * via Log4jConfigListener, delegating to Log4jWebConfigurer underneath.
  *
  * @author Juergen Hoeller
  * @since 13.03.2003
@@ -65,6 +64,10 @@ public abstract class Log4jConfigurer {
 	public static void initLogging(String location) throws FileNotFoundException {
 		String resolvedLocation = SystemPropertyUtils.resolvePlaceholders(location);
 		URL url = ResourceUtils.getURL(resolvedLocation);
+		if (ResourceUtils.URL_PROTOCOL_FILE.equals(url.getProtocol()) && !ResourceUtils.getFile(url).exists()) {
+			throw new FileNotFoundException("Log4j config file [" + resolvedLocation + "] not found");
+		}
+
 		if (resolvedLocation.toLowerCase().endsWith(XML_FILE_EXTENSION)) {
 			DOMConfigurator.configure(url);
 		}
@@ -98,6 +101,7 @@ public static void initLogging(String location, long refreshInterval) throws Fil
 		if (!file.exists()) {
 			throw new FileNotFoundException("Log4j config file [" + resolvedLocation + "] not found");
 		}
+
 		if (resolvedLocation.toLowerCase().endsWith(XML_FILE_EXTENSION)) {
 			DOMConfigurator.configureAndWatch(file.getAbsolutePath(), refreshInterval);
 		}

spring-core/src/main/java/org/springframework/util/ResourceUtils.java

@@ -129,8 +129,8 @@ public static URL getURL(String resourceLocation) throws FileNotFoundException {
 			URL url = (cl != null ? cl.getResource(path) : ClassLoader.getSystemResource(path));
 			if (url == null) {
 				String description = "class path resource [" + path + "]";
-				throw new FileNotFoundException(
-						description + " cannot be resolved to URL because it does not exist");
+				throw new FileNotFoundException(description +
+						" cannot be resolved to URL because it does not exist");
 			}
 			return url;
 		}
@@ -169,9 +169,8 @@ public static File getFile(String resourceLocation) throws FileNotFoundException
 			ClassLoader cl = ClassUtils.getDefaultClassLoader();
 			URL url = (cl != null ? cl.getResource(path) : ClassLoader.getSystemResource(path));
 			if (url == null) {
-				throw new FileNotFoundException(
-						description + " cannot be resolved to absolute file path " +
-						"because it does not reside in the file system");
+				throw new FileNotFoundException(description +
+						" cannot be resolved to absolute file path because it does not exist");
 			}
 			return getFile(url, description);
 		}