From f7faef242681322d01bb781ce44a53bde3ddf7ec Mon Sep 17 00:00:00 2001 From: "Craig R. McClanahan" Date: Sat, 1 Feb 2003 04:11:03 +0000 Subject: [PATCH] Change the class used to detect whether JDK 1.4 is installed from "java.util.logging.Logger" to "java.sql.Savepoint". This means that a JDK 1.3 JVM with an alternative JSR-47 (logging jsr) implementation available will not be mis-identified as a JDK 1.4 system. PR: Bugzilla #16606 Submitted by: Andreas Wendt git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@138951 13f79535-47bb-0310-9956-ffa450edef68 --- .../commons/logging/impl/LogFactoryImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java b/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java index 07ce281..6b3448b 100644 --- a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java +++ b/src/java/org/apache/commons/logging/impl/LogFactoryImpl.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/LogFactoryImpl.java,v 1.20 2002/11/23 03:49:40 craigmcc Exp $ - * $Revision: 1.20 $ - * $Date: 2002/11/23 03:49:40 $ + * $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 $ * * ==================================================================== * @@ -107,7 +107,7 @@ import org.apache.commons.logging.LogFactory; * @author Rod Waldhoff * @author Craig R. McClanahan * @author Richard A. Sitze - * @version $Revision: 1.20 $ $Date: 2002/11/23 03:49:40 $ + * @version $Revision: 1.21 $ $Date: 2003/02/01 04:11:03 $ */ public class LogFactoryImpl extends LogFactory { @@ -456,16 +456,16 @@ public class LogFactoryImpl extends LogFactory { /** * MUST KEEP THIS METHOD PRIVATE - * + * *

Exposing this method outside of * org.apache.commons.logging.LogFactoryImpl * will create a security violation: * This method uses AccessController.doPrivileged(). *

- * + * * Load a class, try first the thread class loader, and * if it fails use the loader that loaded this class. - */ + */ private static Class loadClass( final String name ) throws ClassNotFoundException { @@ -519,7 +519,7 @@ public class LogFactoryImpl extends LogFactory { protected boolean isJdk14Available() { try { - loadClass("java.util.logging.Logger"); + loadClass("java.sql.Savepoint"); loadClass("org.apache.commons.logging.impl.Jdk14Logger"); return (true); } catch (Throwable t) {