svn commit: r1442020 - in /cxf/branches/2.5.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/TrustDecisionUtil.java

[ffang]

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);