cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [2/4] cxf git commit: Fix setup of SSL with Jetty 9.3
Date Wed, 11 Nov 2015 15:47:43 GMT
Fix setup of SSL with Jetty 9.3


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/df4963e5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/df4963e5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/df4963e5

Branch: refs/heads/master
Commit: df4963e5b62f4731f53a65294b0a3483ed946ba1
Parents: 44a3627
Author: Daniel Kulp <dkulp@apache.org>
Authored: Wed Nov 11 10:10:35 2015 -0500
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Wed Nov 11 10:10:35 2015 -0500

----------------------------------------------------------------------
 .../apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/df4963e5/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 0b864f5..e6f0fed 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -583,6 +583,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
                 protected void doStart() throws Exception {
                     setSslContext(createSSLContext(this));
                     super.doStart();
+                    checkKeyStore();
                 }
                 public void checkKeyStore() {
                     //we'll handle this later
@@ -653,8 +654,8 @@ public class JettyHTTPServerEngine implements ServerEngine {
                                                                                      String.class)
                                                         .newInstance(sslcf, "HTTP/1.1");
                 connectionFactories.add(scf);
-                String proto = (major > 9 || (major == 9 && minor >= 3)) ?
"SSL" : "SSL-HTTP";
-                result.getClass().getMethod("setDefaultProtocol", String.class).invoke(result,
proto + "/1.1");
+                String proto = (major > 9 || (major == 9 && minor >= 3)) ?
"SSL" : "SSL-HTTP/1.1";
+                result.getClass().getMethod("setDefaultProtocol", String.class).invoke(result,
proto);
             }
             connectionFactories.add(httpFactory);
             result.getClass().getMethod("setConnectionFactories", Collection.class)


Mime
View raw message