svn commit: r1602787 - /logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java

[mattsicker]

Author: mattsicker
Date: Mon Jun 16 02:14:41 2014
New Revision: 1602787

URL: http://svn.apache.org/r1602787
Log:
Split off provider scanning into protected method to allow external 
activation of OSGi Log4j providers.

Modified:
    
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java

Modified: 
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java?rev=1602787&r1=1602786&r2=1602787&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
 Mon Jun 16 02:14:41 2014
@@ -52,9 +52,12 @@ public final class ProviderUtil {
         try {
             enumResources = cl.getResources(PROVIDER_RESOURCE);
         } catch (final IOException e) {
-            LOGGER.fatal("Unable to locate " + PROVIDER_RESOURCE, e);
+            LOGGER.fatal("Unable to locate {}", PROVIDER_RESOURCE, e);
         }
+        loadProviders(enumResources);
+    }
 
+    protected static void loadProviders(final Enumeration<URL> enumResources) {
         if (enumResources != null) {
             while (enumResources.hasMoreElements()) {
                 final URL url = enumResources.nextElement();
@@ -65,7 +68,7 @@ public final class ProviderUtil {
                     }
                     PROVIDERS.add(new Provider(props, url));
                 } catch (final IOException ioe) {
-                    LOGGER.error("Unable to open " + url.toString(), ioe);
+                    LOGGER.error("Unable to open {}", url, ioe);
                 }
             }
         }