cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1079176 - in /cxf/branches/2.3.x-fixes: ./ rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
Date Tue, 08 Mar 2011 05:41:46 GMT
Author: ningjiang
Date: Tue Mar  8 05:41:46 2011
New Revision: 1079176

URL: http://svn.apache.org/viewvc?rev=1079176&view=rev
Log:
Merged revisions 1079174 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1079174 | ningjiang | 2011-03-08 13:35:15 +0800 (Tue, 08 Mar 2011) | 1 line
  
  CXF-3378 Fixed the Jetty server start up issue when upgrade to Jetty7.3.1
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 05:41:46 2011
@@ -1 +1 @@
-/cxf/trunk:1079046
+/cxf/trunk:1079046,1079174

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java?rev=1079176&r1=1079175&r2=1079176&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
Tue Mar  8 05:41:46 2011
@@ -97,6 +97,13 @@ public class CXFJettySslSocketConnector 
             }
         }
     }
+    
+    protected void doStart() throws Exception {
+        // setup the create SSLContext on the SSLContextFactory
+        getSslContextFactory().setSslContext(createSSLContext());
+        super.doStart();
+    }
+    
     protected SSLContext createSSLContext() throws Exception  {
         String proto = getProtocol() == null
             ? "TLS"



Mime
View raw message