Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 52585 invoked from network); 16 Jul 2010 17:59:39 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Jul 2010 17:59:39 -0000 Received: (qmail 64624 invoked by uid 500); 16 Jul 2010 17:59:39 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 64460 invoked by uid 500); 16 Jul 2010 17:59:39 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 64453 invoked by uid 99); 16 Jul 2010 17:59:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Jul 2010 17:59:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Jul 2010 17:59:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7A37223889E1; Fri, 16 Jul 2010 17:58:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r964891 - in /cxf/branches/2.2.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java Date: Fri, 16 Jul 2010 17:58:43 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100716175843.7A37223889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Jul 16 17:58:43 2010 New Revision: 964891 URL: http://svn.apache.org/viewvc?rev=964891&view=rev Log: Merged revisions 964889 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r964889 | dkulp | 2010-07-16 13:58:01 -0400 (Fri, 16 Jul 2010) | 1 line [CXF-2893] Check default classloader for logger class ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 16 17:58:43 2010 @@ -1 +1 @@ -/cxf/trunk:964618,964818,964822,964853 +/cxf/trunk:964618,964818,964822,964853,964889 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java?rev=964891&r1=964890&r2=964891&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java (original) +++ cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java Fri Jul 16 17:58:43 2010 @@ -95,8 +95,12 @@ public final class LogUtils { } } if (!StringUtils.isEmpty(cname)) { - loggerClass = Class.forName(cname.trim(), true, - Thread.currentThread().getContextClassLoader()); + try { + loggerClass = Class.forName(cname.trim(), true, + Thread.currentThread().getContextClassLoader()); + } catch (Throwable ex) { + loggerClass = Class.forName(cname.trim()); + } getLogger(LogUtils.class).fine("Using " + loggerClass.getName() + " for logging."); } } catch (Throwable ex) {