From 433ad87cd11a009a21957286f53aaf8765073c10 Mon Sep 17 00:00:00 2001
From: Robert Burrell Donkin <rdonkin@apache.org>
Date: Sun, 17 Oct 2004 09:14:10 +0000
Subject: [PATCH] Fix addressing null pointer when logging is loaded by boot
 classloader for JRE's that return a null classloader in this situtation.
 Issue #31710. Patch contributed by David Ferrero.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@139052 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/commons/logging/impl/LogFactoryImpl.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java b/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
index 8ccffc3..db05081 100644
--- a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
+++ b/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
@@ -63,7 +63,7 @@ import org.apache.commons.logging.LogFactory;
  * @author Rod Waldhoff
  * @author Craig R. McClanahan
  * @author Richard A. Sitze
- * @version $Revision: 1.34 $ $Date: 2004/10/17 09:02:48 $
+ * @version $Revision: 1.35 $ $Date: 2004/10/17 09:14:10 $
  */
 
 public class LogFactoryImpl extends LogFactory {
@@ -371,8 +371,11 @@ public class LogFactoryImpl extends LogFactory {
         Class logClass = null;
         Class logInterface = null;
         try {
-            logInterface = this.getClass().getClassLoader().loadClass
-                (LOG_INTERFACE);
+            ClassLoader cl = this.getClass().getClassLoader();
+            // handle the case if getClassLoader() returns null
+            // It may mean this class was loaded from the bootstrap classloader
+            logInterface = (cl == null) ? loadClass(LOG_INTERFACE) : 
+                                          cl.loadClass(LOG_INTERFACE);
             logClass = loadClass(logClassName);
             if (logClass == null) {
                 throw new LogConfigurationException