You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by ff...@apache.org on 2013/02/04 04:26:52 UTC

svn commit: r1442016 - /cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Author: ffang
Date: Mon Feb  4 03:26:52 2013
New Revision: 1442016

URL: http://svn.apache.org/viewvc?rev=1442016&view=rev
Log:
[CXF-4803]NPE is thrown while enabling fine log level in TrustDecisionUtil if MessageTrustDecider from message context is used

Modified:
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1442016&r1=1442015&r2=1442016&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Mon Feb  4 03:26:52 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);