svn commit: r899773 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSServerParametersConfig.java

[dkulp]

Author: dkulp
Date: Fri Jan 15 19:24:37 2010
New Revision: 899773

URL: http://svn.apache.org/viewvc?rev=899773&view=rev
Log:
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.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSServerParametersConfig.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/TLSServerParametersConfig.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/TLSServerParametersConfig.java?rev=899773&r1=899772&r2=899773&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSServerParametersConfig.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSServerParametersConfig.java
 Fri Jan 15 19:24:37 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());
         }