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

Fix javadoc and fix java1.5 compile warnings.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@177071 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Simon Kitching
2005-05-23 01:04:54 +00:00
parent a408e51f46
commit 75c8135c03
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/org/apache/commons/logging/LogFactory.java
View File

@@ -729,11 +729,13 @@ public abstract class LogFactory {
try { try {
// Are we running on a JDK 1.2 or later system? // Are we running on a JDK 1.2 or later system?
Method method = Thread.class.getMethod("getContextClassLoader", null); Method method = Thread.class.getMethod("getContextClassLoader",
(Class[]) null);
// Get the thread context class loader (if there is one) // Get the thread context class loader (if there is one)
try { try {
classLoader = (ClassLoader)method.invoke(Thread.currentThread(), null); classLoader = (ClassLoader)method.invoke(Thread.currentThread(),
(Object[]) null);
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
throw new LogConfigurationException throw new LogConfigurationException
("Unexpected IllegalAccessException", e); ("Unexpected IllegalAccessException", e);
@@ -915,7 +917,7 @@ public abstract class LogFactory {
* @param factoryClass * @param factoryClass
* @param classLoader * @param classLoader
* *
* @returns either a LogFactory object or a LogConfigurationException object. * @return either a LogFactory object or a LogConfigurationException object.
*/ */
protected static Object createFactory(String factoryClass, ClassLoader classLoader) { protected static Object createFactory(String factoryClass, ClassLoader classLoader) {
@@ -1215,7 +1217,7 @@ public abstract class LogFactory {
* the specified object's class has overidden the toString method. * the specified object's class has overidden the toString method.
* *
* @param o may be null. * @param o may be null.
* @return * @return a string of form classname@hashcode, or "null" if param o is null.
*/ */
public static String objectId(Object o) { public static String objectId(Object o) {
if (o == null) { if (o == null) {

2
src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
View File

@@ -660,7 +660,7 @@ public class LogFactoryImpl extends LogFactory {
loadClass("java.util.logging.Logger"); loadClass("java.util.logging.Logger");
loadClass("org.apache.commons.logging.impl.Jdk14Logger"); loadClass("org.apache.commons.logging.impl.Jdk14Logger");
Class throwable = loadClass("java.lang.Throwable"); Class throwable = loadClass("java.lang.Throwable");
if (throwable.getDeclaredMethod("getStackTrace", null) == null) { if (throwable.getDeclaredMethod("getStackTrace", (Class[]) null) == null) {
return (false); return (false);
} }
logDiagnostic("Found Jdk14."); logDiagnostic("Found Jdk14.");

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

@@ -586,11 +586,13 @@ public class SimpleLog implements Log, Serializable {
if (classLoader == null) { if (classLoader == null) {
try { try {
// Are we running on a JDK 1.2 or later system? // Are we running on a JDK 1.2 or later system?
Method method = Thread.class.getMethod("getContextClassLoader", null); Method method = Thread.class.getMethod("getContextClassLoader",
(Class[]) null);
// Get the thread context class loader (if there is one) // Get the thread context class loader (if there is one)
try { try {
classLoader = (ClassLoader)method.invoke(Thread.currentThread(), null); classLoader = (ClassLoader)method.invoke(Thread.currentThread(),
(Class[]) null);
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
; // ignore ; // ignore
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {