You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/01/15 20:31:37 UTC
svn commit: r899776 - in /cxf/branches/2.1.x-fixes: ./
rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java
Author: dkulp
Date: Fri Jan 15 19:31:36 2010
New Revision: 899776
URL: http://svn.apache.org/viewvc?rev=899776&view=rev
Log:
Merged revisions 899754 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................
r899754 | dkulp | 2010-01-15 13:56:51 -0500 (Fri, 15 Jan 2010) | 9 lines
Merged revisions 899746 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r899746 | dkulp | 2010-01-15 13:36:41 -0500 (Fri, 15 Jan 2010) | 1 line
[CXF-2618] Fix problem of secureSocketProtocol not being configurable
........
................
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java?rev=899776&r1=899775&r2=899776&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java Fri Jan 15 19:31:36 2010
@@ -63,6 +63,9 @@
if (params.isDisableCNCheck()) {
ret.setDisableCNCheck(true);
}
+ if (params.isSetSecureSocketProtocol()) {
+ ret.setSecureSocketProtocol(params.getSecureSocketProtocol());
+ }
if (params.isSetCipherSuitesFilter()) {
ret.setCipherSuitesFilter(params.getCipherSuitesFilter());
}