From 740d07813717d11dcfb6116d30de93a26ca2a25e Mon Sep 17 00:00:00 2001
From: "Craig R. McClanahan" <craigmcc@apache.org>
Date: Mon, 4 Mar 2002 00:41:37 +0000
Subject: [PATCH] Make discovery process on LogSource compatible with that used
 by LogFactory with respect to system properties.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@138876 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/commons/logging/LogSource.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/java/org/apache/commons/logging/LogSource.java b/src/java/org/apache/commons/logging/LogSource.java
index 8745994..03a143f 100644
--- a/src/java/org/apache/commons/logging/LogSource.java
+++ b/src/java/org/apache/commons/logging/LogSource.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/java/org/apache/commons/logging/LogSource.java,v 1.13 2002/02/14 00:19:03 craigmcc Exp $
- * $Revision: 1.13 $
- * $Date: 2002/02/14 00:19:03 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/java/org/apache/commons/logging/LogSource.java,v 1.14 2002/03/04 00:41:37 craigmcc Exp $
+ * $Revision: 1.14 $
+ * $Date: 2002/03/04 00:41:37 $
  *
  * ====================================================================
  *
@@ -97,7 +97,7 @@ import org.apache.commons.logging.impl.NoOpLog;
  *  implementation performs exactly the same algorithm as this class did
  *
  * @author Rod Waldhoff
- * @version $Id: LogSource.java,v 1.13 2002/02/14 00:19:03 craigmcc Exp $
+ * @version $Id: LogSource.java,v 1.14 2002/03/04 00:41:37 craigmcc Exp $
  */
 public class LogSource {
 
@@ -132,7 +132,8 @@ public class LogSource {
 
         // Is JDK 1.4 Logging Available?
         try {
-            if (null != Class.forName("java.util.logging.Logger")) {
+            if ((null != Class.forName("java.util.logging.Logger")) &&
+                (null != Class.forName("org.apache.commons.logging.impl.Jdk14Logger"))) {
                 jdk14IsAvailable = true;
             } else {
                 jdk14IsAvailable = false;
@@ -145,6 +146,9 @@ public class LogSource {
         String name = null;
         try {
             name = System.getProperty("org.apache.commons.logging.log");
+            if (name == null) {
+                name = System.getProperty("org.apache.commons.logging.Log");
+            }
         } catch (Throwable t) {
         }
         if (name != null) {