From 6bafa3f510244a705262435f5e75ab40c679f480 Mon Sep 17 00:00:00 2001
From: "Craig R. McClanahan" <craigmcc@apache.org>
Date: Sun, 31 Mar 2002 00:31:49 +0000
Subject: [PATCH] Modify the logger discovery contract to perform the complete
 set of checks even in environments (such as an Applet) where
 System.getProperty() throws a security exception.  Previously, this was
 causing the checks for Log4J or JDK 1.4 logging to be skipped.

PR:  Bugzilla #7468
Reported By:  Tim Vernum (tpv at spamcop.net)


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@138881 13f79535-47bb-0310-9956-ffa450edef68
---
 .../commons/logging/impl/LogFactoryImpl.java  | 51 +++++++++++--------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java b/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
index c1aae70..1e4fa9e 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.6 2002/02/27 18:01:41 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2002/02/27 18:01:41 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java,v 1.7 2002/03/31 00:31:49 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/03/31 00:31:49 $
  *
  * ====================================================================
  *
@@ -104,7 +104,7 @@ import org.apache.commons.logging.LogSource;
  *
  * @author Rod Waldhoff
  * @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2002/02/27 18:01:41 $
+ * @version $Revision: 1.7 $ $Date: 2002/03/31 00:31:49 $
  */
 
 public class LogFactoryImpl extends LogFactory {
@@ -367,29 +367,36 @@ public class LogFactoryImpl extends LogFactory {
 
         // Identify the Log implementation class we will be using
         String logClassName = null;
-        try {
+        if (logClassName == null) {
             logClassName = (String) getAttribute(LOG_PROPERTY);
-            if (logClassName == null) { // @deprecated
-                logClassName = (String) getAttribute(LOG_PROPERTY_OLD);
-            }
-            if (logClassName == null) {
+        }
+        if (logClassName == null) { // @deprecated
+            logClassName = (String) getAttribute(LOG_PROPERTY_OLD);
+        }
+        if (logClassName == null) {
+            try {
                 logClassName = System.getProperty(LOG_PROPERTY);
+            } catch (SecurityException e) {
+                ;
             }
-            if (logClassName == null) { // @deprecated
+        }
+        if (logClassName == null) { // @deprecated
+            try {
                 logClassName = System.getProperty(LOG_PROPERTY_OLD);
+            } catch (SecurityException e) {
+                ;
             }
-            if ((logClassName == null) && isLog4JAvailable()) {
-                logClassName =
-                    "org.apache.commons.logging.impl.Log4JCategoryLog";
-            }
-            if ((logClassName == null) && isJdk14Available()) {
-                logClassName =
-                    "org.apache.commons.logging.impl.Jdk14Logger";
-            }
-            if (logClassName == null) {
-                logClassName = LOG_DEFAULT;
-            }
-        } catch (SecurityException e) {
+        }
+        if ((logClassName == null) && isLog4JAvailable()) {
+            logClassName =
+                "org.apache.commons.logging.impl.Log4JCategoryLog";
+        }
+        if ((logClassName == null) && isJdk14Available()) {
+            logClassName =
+                "org.apache.commons.logging.impl.Jdk14Logger";
+        }
+        if (logClassName == null) {
+            logClassName = LOG_DEFAULT;
         }
 
         // Attempt to load the Log implementation class