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:36:52 UTC

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

Author: ffang
Date: Mon Feb  4 03:36:52 2013
New Revision: 1442018

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

Modified:
    cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/TrustDecisionUtil.java

Modified: cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/TrustDecisionUtil.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/TrustDecisionUtil.java?rev=1442018&r1=1442017&r2=1442018&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/TrustDecisionUtil.java (original)
+++ cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/TrustDecisionUtil.java Mon Feb  4 03:36:52 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);