Author: mattsicker
Date: Sat Jun 14 18:10:44 2014
New Revision: 1602612
URL: http://svn.apache.org/r1602612
Log:
Use TCCL as first CL instead of this class.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java?rev=1602612&r1=1602611&r2=1602612&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
Sat Jun 14 18:10:44 2014
@@ -253,7 +253,7 @@ public abstract class ConfigurationFacto
final boolean isClassLoaderScheme = scheme != null &&
scheme.equals(CLASS_LOADER_SCHEME);
final boolean isClassPathScheme = scheme != null &&
!isClassLoaderScheme && scheme.equals(CLASS_PATH_SCHEME);
if (scheme == null || isClassLoaderScheme || isClassPathScheme) {
- final ClassLoader loader = this.getClass().getClassLoader();
+ final ClassLoader loader = Loader.getThreadContextClassLoader();
String path;
if (isClassLoaderScheme) {
path =
configLocation.toString().substring(CLASS_LOADER_SCHEME_LENGTH);