Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F04D4E631 for ; Mon, 4 Feb 2013 03:44:18 +0000 (UTC) Received: (qmail 2176 invoked by uid 500); 4 Feb 2013 03:44:18 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 2125 invoked by uid 500); 4 Feb 2013 03:44:18 -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 2114 invoked by uid 99); 4 Feb 2013 03:44:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Feb 2013 03:44:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 04 Feb 2013 03:44:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 04B6723889EB; Mon, 4 Feb 2013 03:43:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1442020 - in /cxf/branches/2.5.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/TrustDecisionUtil.java Date: Mon, 04 Feb 2013 03:43:55 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130204034356.04B6723889EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ffang Date: Mon Feb 4 03:43:55 2013 New Revision: 1442020 URL: http://svn.apache.org/viewvc?rev=1442020&view=rev Log: Merged revisions 1442018 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1442018 | ffang | 2013-02-04 11:36:52 +0800 (δΈ€, 04 2 2013) | 1 line [CXF-4803]NPE is thrown while enabling fine log level in TrustDecisionUtil if MessageTrustDecider from message context is used ........ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/TrustDecisionUtil.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.6.x-fixes:r1442018 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/TrustDecisionUtil.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/TrustDecisionUtil.java?rev=1442020&r1=1442019&r2=1442020&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/TrustDecisionUtil.java (original) +++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/TrustDecisionUtil.java Mon Feb 4 03:43:55 2013 @@ -92,7 +92,7 @@ final class TrustDecisionUtil { connection.disconnect(); if (LOG.isLoggable(Level.FINE)) { LOG.log(Level.FINE, "Trust Decider " - + trustDecider.getLogicalName() + + trustDecider != null ? trustDecider.getLogicalName() : decider2.getLogicalName() + " considers Conduit " + conduitName + " untrusted.", untrustedEx);