From 342bbe7a7a67a2faecd2c6d05e1985b24fb3f049 Mon Sep 17 00:00:00 2001
From: Simon Kitching <skitching@apache.org>
Date: Sun, 19 Nov 2006 08:50:31 +0000
Subject: [PATCH] Improve diagnostics when underlying lib throws
 InvocationTargetException. Patch provided by Lilliane E. Blaze. See Jira
 issue LOGGING-111.

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

diff --git a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java b/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
index 85df26b..15339b3 100644
--- a/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
+++ b/src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
@@ -908,7 +908,7 @@ public class LogFactoryImpl extends LogFactory {
         if (isDiagnosticsEnabled()) {
             logDiagnostic(
                 "No user-specified Log implementation; performing discovery" +
-            	" using the standard supported logging implementations...");
+                " using the standard supported logging implementations...");
         }
         for(int i=0; (i<classesToDiscover.length) && (result == null); ++i) {
             result = createLogFromClass(classesToDiscover[i], logCategory, true);
@@ -1362,6 +1362,29 @@ public class LogFactoryImpl extends LogFactory {
                       + logAdapterClassName + "' -- "
                       + discoveryFlaw.getClass().getName() + ": "
                       + discoveryFlaw.getLocalizedMessage());       
+
+            if (discoveryFlaw instanceof InvocationTargetException ) {
+		// Ok, the lib is there but while trying to create a real underlying
+		// logger something failed in the underlying lib; display info about
+		// that if possible.
+                InvocationTargetException ite = (InvocationTargetException)discoveryFlaw;
+                Throwable cause = ite.getTargetException();
+                if (cause != null) {
+                    logDiagnostic("... InvocationTargetException: " +
+                        cause.getClass().getName() + ": " +
+                        cause.getLocalizedMessage());
+
+                    if (cause instanceof ExceptionInInitializerError) {
+                        ExceptionInInitializerError eiie = (ExceptionInInitializerError)cause;
+                        Throwable cause2 = eiie.getException();
+                        if (cause2 != null) {
+                            logDiagnostic("... ExceptionInInitializerError: " +
+                                cause2.getClass().getName() + ": " +
+                                cause2.getLocalizedMessage());
+                        }
+                    }
+                }
+            }
         }
         
         if (!allowFlawedDiscovery) {