Added tests for class loading, no problems detected in "common" use cases
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@138954 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/java/org/apache/commons/logging/LogFactory.java,v 1.19 2002/12/18 07:20:50 craigmcc Exp $
|
||||
* $Revision: 1.19 $
|
||||
* $Date: 2002/12/18 07:20:50 $
|
||||
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/java/org/apache/commons/logging/LogFactory.java,v 1.20 2003/03/01 09:55:06 baliuka Exp $
|
||||
* $Revision: 1.20 $
|
||||
* $Date: 2003/03/01 09:55:06 $
|
||||
*
|
||||
* ====================================================================
|
||||
*
|
||||
@@ -87,7 +87,7 @@ import java.util.Properties;
|
||||
* @author Craig R. McClanahan
|
||||
* @author Costin Manolache
|
||||
* @author Richard A. Sitze
|
||||
* @version $Revision: 1.19 $ $Date: 2002/12/18 07:20:50 $
|
||||
* @version $Revision: 1.20 $ $Date: 2003/03/01 09:55:06 $
|
||||
*/
|
||||
|
||||
public abstract class LogFactory {
|
||||
@@ -580,8 +580,15 @@ public abstract class LogFactory {
|
||||
// Nothing more to try, onwards.
|
||||
throw e;
|
||||
}
|
||||
// ignore exception, continue
|
||||
|
||||
}catch(ClassCastException e){
|
||||
|
||||
if (classLoader == LogFactory.class.getClassLoader()) {
|
||||
// Nothing more to try, onwards (bug in loader implementation).
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
// ignore exception, continue
|
||||
}
|
||||
|
||||
/* At this point, either classLoader == null, OR
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java,v 1.21 2003/02/01 04:11:03 craigmcc Exp $
|
||||
* $Revision: 1.21 $
|
||||
* $Date: 2003/02/01 04:11:03 $
|
||||
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java,v 1.22 2003/03/01 09:55:07 baliuka Exp $
|
||||
* $Revision: 1.22 $
|
||||
* $Date: 2003/03/01 09:55:07 $
|
||||
*
|
||||
* ====================================================================
|
||||
*
|
||||
@@ -107,7 +107,7 @@ import org.apache.commons.logging.LogFactory;
|
||||
* @author Rod Waldhoff
|
||||
* @author Craig R. McClanahan
|
||||
* @author Richard A. Sitze
|
||||
* @version $Revision: 1.21 $ $Date: 2003/02/01 04:11:03 $
|
||||
* @version $Revision: 1.22 $ $Date: 2003/03/01 09:55:07 $
|
||||
*/
|
||||
|
||||
public class LogFactoryImpl extends LogFactory {
|
||||
@@ -519,7 +519,7 @@ public class LogFactoryImpl extends LogFactory {
|
||||
protected boolean isJdk14Available() {
|
||||
|
||||
try {
|
||||
loadClass("java.sql.Savepoint");
|
||||
loadClass("java.util.logging.Logger");
|
||||
loadClass("org.apache.commons.logging.impl.Jdk14Logger");
|
||||
return (true);
|
||||
} catch (Throwable t) {
|
||||
|
||||
Reference in New Issue
Block a user