You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2013/08/14 19:34:59 UTC
svn commit: r1513970 -
/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java
Author: ggregory
Date: Wed Aug 14 17:34:58 2013
New Revision: 1513970
URL: http://svn.apache.org/r1513970
Log:
Better lvar name and param name.
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java?rev=1513970&r1=1513969&r2=1513970&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java Wed Aug 14 17:34:58 2013
@@ -143,12 +143,12 @@ public class PluginManager {
}
final long start = System.nanoTime();
final ResolverUtil resolver = new ResolverUtil();
- final ClassLoader loader = Loader.getClassLoader();
- if (loader != null) {
- resolver.setClassLoader(loader);
+ final ClassLoader classLoader = Loader.getClassLoader();
+ if (classLoader != null) {
+ resolver.setClassLoader(classLoader);
}
if (preLoad) {
- final ConcurrentMap<String, ConcurrentMap<String, PluginType>> map = decode(loader);
+ final ConcurrentMap<String, ConcurrentMap<String, PluginType>> map = decode(classLoader);
if (map != null) {
pluginTypeMap = map;
plugins = map.get(type);
@@ -197,10 +197,10 @@ public class PluginManager {
}
@SuppressWarnings("unchecked")
- private static ConcurrentMap<String, ConcurrentMap<String, PluginType>> decode(final ClassLoader loader) {
+ private static ConcurrentMap<String, ConcurrentMap<String, PluginType>> decode(final ClassLoader classLoader) {
Enumeration<URL> resources;
try {
- resources = loader.getResources(PATH + FILENAME);
+ resources = classLoader.getResources(PATH + FILENAME);
} catch (final IOException ioe) {
LOGGER.warn("Unable to preload plugins", ioe);
return null;