Author: dkulp Date: Fri Jan 15 19:34:12 2010 New Revision: 899778 URL: http://svn.apache.org/viewvc?rev=899778&view=rev Log: Merged revisions 899773 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r899773 | dkulp | 2010-01-15 14:24:37 -0500 (Fri, 15 Jan 2010) | 9 lines Merged revisions 899771 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r899771 | dkulp | 2010-01-15 14:22:55 -0500 (Fri, 15 Jan 2010) | 1 line [CXF-2618] On the server side as well ........ ................ 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/TLSServerParametersConfig.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/TLSServerParametersConfig.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/TLSServerParametersConfig.java?rev=899778&r1=899777&r2=899778&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSServerParametersConfig.java (original) +++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSServerParametersConfig.java Fri Jan 15 19:34:12 2010 @@ -35,7 +35,9 @@ public TLSServerParametersConfig(TLSServerParametersType params) throws GeneralSecurityException, IOException { - + if (params.isSetSecureSocketProtocol()) { + this.setSecureSocketProtocol(params.getSecureSocketProtocol()); + } if (params.isSetCipherSuitesFilter()) { this.setCipherSuitesFilter(params.getCipherSuitesFilter()); }
