--- src/java/org/apache/commons/logging/LogFactory.java.orig	2011-05-24 11:40:51.000000000 -0400
+++ src/java/org/apache/commons/logging/LogFactory.java	2011-05-24 11:48:14.000000000 -0400
@@ -68,6 +68,14 @@
     public static final String TCCL_KEY = "use_tccl";
 
     /**
+     * Whether or not logging classes should be loaded via the thread context
+     * class loader (TCCL).  Set via static initialization to true by default
+     * unless the system property org.apache.commons.logging.use_tccl is set
+     * to false or 0.
+     */
+    public static boolean useTCCL;
+
+    /**
      * The name (<code>org.apache.commons.logging.LogFactory</code>) of the property 
      * used to identify the LogFactory implementation
      * class name. This can be used as a system property, or as an entry in a
@@ -1725,6 +1733,18 @@
     // ----------------------------------------------------------------------
 
     static {
+
+       String useTCCLSysProp = System.getProperty("org.apache.commons.logging.use_tccl");
+
+       if ("false".equalsIgnoreCase(useTCCLSysProp) || "0".equals(useTCCLSysProp))
+       {
+           useTCCL=false;
+       }
+       else
+       {
+           useTCCL=true;
+       }
+
         // note: it's safe to call methods before initDiagnostics.
         thisClassLoader = getClassLoader(LogFactory.class);
         initDiagnostics();