Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 79589 invoked from network); 15 Jan 2010 18:57:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Jan 2010 18:57:24 -0000 Received: (qmail 33736 invoked by uid 500); 15 Jan 2010 18:57:24 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 33665 invoked by uid 500); 15 Jan 2010 18:57:24 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 33656 invoked by uid 99); 15 Jan 2010 18:57:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jan 2010 18:57:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jan 2010 18:57:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 12ACB23888E4; Fri, 15 Jan 2010 18:57:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r899754 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java Date: Fri, 15 Jan 2010 18:56:56 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100115185701.12ACB23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Jan 15 18:56:51 2010 New Revision: 899754 URL: http://svn.apache.org/viewvc?rev=899754&view=rev Log: 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.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.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.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java?rev=899754&r1=899753&r2=899754&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java (original) +++ cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java Fri Jan 15 18:56:51 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()); }