cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [2/2] cxf git commit: Merge branch 'patch-1' of https://github.com/willuhn/cxf
Date Thu, 22 Oct 2015 14:29:29 GMT
Merge branch 'patch-1' of https://github.com/willuhn/cxf


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

Branch: refs/heads/master
Commit: 5e3aea2cffa48fd004125726be7a792c1e7e2322
Parents: c1863fc 5669ebf
Author: Daniel Kulp <dkulp@apache.org>
Authored: Thu Oct 22 10:26:39 2015 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Thu Oct 22 10:27:03 2015 -0400

----------------------------------------------------------------------
 .../http_jetty/JettyHTTPServerEngine.java       | 23 ++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/5e3aea2c/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
----------------------------------------------------------------------
diff --cc rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 1b43dc4,86f6029..e4da5f4
--- 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
@@@ -591,8 -591,22 +591,22 @@@ public class JettyHTTPServerEngine impl
              decorateCXFJettySslSocketConnector(sslcf);
          }
          AbstractConnector result = null;
-         if (!Server.getVersion().startsWith("8")) {
-             result = createConnectorJetty9(sslcf, hosto, porto);
+         
 -        int major = 0;
++        int major = 8;
+         int minor = 0;
+         try
+         {
+             String[] version = Server.getVersion().split("\\.");
 -            int major = Integer.parseInt(version[0]);
 -            int minor = Integer.parseInt(version[1]);
++            major = Integer.parseInt(version[0]);
++            minor = Integer.parseInt(version[1]);
+         }
+         catch (Exception e)
+         {
+             // unparsable version
+         }
+     
+         if (major >= 9) {
+             result = createConnectorJetty9(sslcf, hosto, porto, major, minor);
          } else {
              result = createConnectorJetty8(sslcf, hosto, porto);
          }        


Mime
View raw message