svn commit: r1442017 - in /cxf/branches/2.7.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

[ffang]

Author: ffang
Date: Mon Feb  4 03:35:07 2013
New Revision: 1442017

URL: http://svn.apache.org/viewvc?rev=1442017&view=rev
Log:
Merged revisions 1442016 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1442016 | ffang | 2013-02-04 11:26: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.7.x-fixes/   (props changed)
    
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1442016

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1442017&r1=1442016&r2=1442017&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 Mon Feb  4 03:35:07 2013
@@ -1693,7 +1693,7 @@ public abstract class HTTPConduit 
                 } catch (UntrustedURLConnectionIOException untrustedEx) {
                     if (LOG.isLoggable(Level.FINE)) {
                         LOG.log(Level.FINE, "Trust Decider "
-                            + trustDecider.getLogicalName()
+                            + trustDecider != null ? 
trustDecider.getLogicalName() : decider2.getLogicalName()
                             + " considers Conduit "
                             + conduitName 
                             + " untrusted.", untrustedEx);