From d3b8b85e48e9f6744e038d8c0f38a2a54c995399 Mon Sep 17 00:00:00 2001
From: "Craig R. McClanahan" <craigmcc@apache.org>
Date: Sat, 15 Jun 2002 20:54:48 +0000
Subject: [PATCH] Make SimpleLog check for its "simplelog.properties" resource
 in the thread context class loader, if present, while using the same trick
 LogFactory does to protect JDK 1.1 compatibility.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@138895 13f79535-47bb-0310-9956-ffa450edef68
---
 .../commons/logging/impl/SimpleLog.java       | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/java/org/apache/commons/logging/impl/SimpleLog.java b/src/java/org/apache/commons/logging/impl/SimpleLog.java
index c437315..1291edb 100644
--- a/src/java/org/apache/commons/logging/impl/SimpleLog.java
+++ b/src/java/org/apache/commons/logging/impl/SimpleLog.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/java/org/apache/commons/logging/impl/SimpleLog.java,v 1.3 2002/02/26 04:06:22 jstrachan Exp $
- * $Revision: 1.3 $
- * $Date: 2002/02/26 04:06:22 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/java/org/apache/commons/logging/impl/SimpleLog.java,v 1.4 2002/06/15 20:54:48 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/06/15 20:54:48 $
  *
  * ====================================================================
  *
@@ -63,6 +63,7 @@
 package org.apache.commons.logging.impl;
 
 import java.io.InputStream;
+import java.lang.reflect.Method;
 import java.security.AccessControlException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -105,7 +106,7 @@ import org.apache.commons.logging.Log;
  * @author Rod Waldhoff
  * @author Robert Burrell Donkin
  *
- * @version $Id: SimpleLog.java,v 1.3 2002/02/26 04:06:22 jstrachan Exp $
+ * @version $Id: SimpleLog.java,v 1.4 2002/06/15 20:54:48 craigmcc Exp $
  */
 public class SimpleLog implements Log {
 
@@ -167,9 +168,23 @@ public class SimpleLog implements Log {
                 }
             }
 
+            // identify the class loader to attempt resource loading with
+            ClassLoader classLoader = null;
+            try {
+                Method method =
+                    Thread.class.getMethod("getContextClassLoader", null);
+                classLoader = (ClassLoader)
+                    method.invoke(Thread.currentThread(), null);
+            } catch (Exception e) {
+                ; // Ignored (security exception or JDK 1.1)
+            }
+            if (classLoader == null) {
+                classLoader = SimpleLog.class.getClassLoader();
+            }
+
             // add props from the resource simplelog.properties
             InputStream in =
-                ClassLoader.getSystemResourceAsStream("simplelog.properties");
+                classLoader.getResourceAsStream("simplelog.properties");
             if(null != in) {
                 try {
                     simpleLogProps.load(in);