Siphalor/tweed5-commons-logging
1
0
Fork 0
Code Activity

Make SimpleLog check for its "simplelog.properties" resource in the thread

Browse Source 
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
This commit is contained in:
Craig R. McClanahan
2002-06-15 20:54:48 +00:00
parent 08ee4c68c3
commit d3b8b85e48
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/java/org/apache/commons/logging/impl/SimpleLog.java
View File

@@ -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 $ * $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.3 $ * $Revision: 1.4 $
* $Date: 2002/02/26 04:06:22 $ * $Date: 2002/06/15 20:54:48 $
* *
* ==================================================================== * ====================================================================
* *
@@ -63,6 +63,7 @@
package org.apache.commons.logging.impl; package org.apache.commons.logging.impl;
import java.io.InputStream; import java.io.InputStream;
import java.lang.reflect.Method;
import java.security.AccessControlException; import java.security.AccessControlException;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@@ -105,7 +106,7 @@ import org.apache.commons.logging.Log;
* @author Rod Waldhoff * @author Rod Waldhoff
* @author Robert Burrell Donkin * @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 { 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 // add props from the resource simplelog.properties
InputStream in = InputStream in =
ClassLoader.getSystemResourceAsStream("simplelog.properties"); classLoader.getResourceAsStream("simplelog.properties");
if(null != in) { if(null != in) {
try { try {
simpleLogProps.load(in); simpleLogProps.load(in);