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 15:37:39 UTC
svn commit: r1442138 - in /cxf/branches/2.5.x-fixes: ./
rt/transports/http/src/main/java/org/apache/cxf/transport/http/TrustDecisionUtil.java
Author: ffang
Date: Mon Feb 4 14:37:39 2013
New Revision: 1442138
URL: http://svn.apache.org/viewvc?rev=1442138&view=rev
Log:
Merged revisions 1442136 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1442136 | ffang | 2013-02-04 22:33:06 +0800 (δΈ€, 04 2 2013) | 1 line
[CXF-4803]add {} ensure operator sequence is correct
........
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:r1442136
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=1442138&r1=1442137&r2=1442138&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 14:37:39 2013
@@ -92,7 +92,7 @@ final class TrustDecisionUtil {
connection.disconnect();
if (LOG.isLoggable(Level.FINE)) {
LOG.log(Level.FINE, "Trust Decider "
- + trustDecider != null ? trustDecider.getLogicalName() : decider2.getLogicalName()
+ + (trustDecider != null ? trustDecider.getLogicalName() : decider2.getLogicalName())
+ " considers Conduit "
+ conduitName
+ " untrusted.", untrustedEx);