diff --git a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java b/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
index b51fa63..a2f23cf 100644
--- a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
+++ b/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
@@ -949,10 +949,26 @@ public class LogFactoryImpl extends LogFactory {
                 contextClassLoader, thisClassLoader);
 
         if (baseClassLoader == null) {
+           // The two classloaders are not part of a parent child relationship.
+           // In some classloading setups (e.g. JBoss with its 
+           // UnifiedLoaderRepository) this can still work, so if user hasn't
+           // forbidden it, just return the contextClassLoader.
+           if (allowFlawedContext) {              
+              logDiagnostic(
+                 "Warning: the context classloader is not part of a"
+                 + " parent-child relationship with the classloader that"
+                 + " loaded LogFactoryImpl.");
+              // If contextClassLoader were null, getLowestClassLoader() would
+              // have returned thisClassLoader.  The fact we are here means
+              // contextClassLoader is not null, so we can just return it.
+              return contextClassLoader;
+           }
+           else {
             throw new LogConfigurationException(
                 "Bad classloader hierarchy; LogFactoryImpl was loaded via"
                 + " a classloader that is not related to the current context"
-                + " classloader."); 
+                + " classloader.");
+           }           
         }
 
         if (baseClassLoader != contextClassLoader) {