Repository: cxf Updated Branches: refs/heads/3.1.x-fixes d69a34be8 -> fd28dc95e
Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fd28dc95 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fd28dc95 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fd28dc95 Branch: refs/heads/3.1.x-fixes Commit: fd28dc95e719fdd29a05eee48ad99ae505cfbc9e Parents: 6a23ff6 Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Mar 24 18:44:52 2017 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Mar 24 18:45:05 2017 +0000 ---------------------------------------------------------------------- .../http_jetty/JettyHTTPServerEngineFactory.java | 12 ------------ 1 file changed, 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/fd28dc95/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java index f9d0765..e5e85a8 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java @@ -268,13 +268,6 @@ public class JettyHTTPServerEngineFactory { * @throws GeneralSecurityException * @throws IOException */ -<<<<<<< HEAD - public synchronized JettyHTTPServerEngine createJettyHTTPServerEngine(String host, int port, - String protocol) throws GeneralSecurityException, IOException { - LOG.fine("Creating Jetty HTTP Server Engine for port " + port + "."); - JettyHTTPServerEngine ref = getOrCreate(this, host, port, null); - // checking the protocol -======= public synchronized JettyHTTPServerEngine createJettyHTTPServerEngine(String host, int port, String protocol, String id) throws GeneralSecurityException, IOException { LOG.fine("Creating Jetty HTTP Server Engine for port " + port + "."); @@ -284,7 +277,6 @@ public class JettyHTTPServerEngineFactory { } JettyHTTPServerEngine ref = getOrCreate(this, host, port, tlsParameters); // checking the protocol ->>>>>>> e70c78e... CXF-7299 - No way to configure TLS for the JettyHTTPServerEngineFactory in code if (!protocol.equals(ref.getProtocol())) { throw new IOException("Protocol mismatch for port " + port + ": " + "engine's protocol is " + ref.getProtocol() @@ -314,16 +306,12 @@ public class JettyHTTPServerEngineFactory { String protocol) throws GeneralSecurityException, IOException { return createJettyHTTPServerEngine(null, port, protocol); } -<<<<<<< HEAD - -======= public synchronized JettyHTTPServerEngine createJettyHTTPServerEngine(String host, int port, String protocol) throws GeneralSecurityException, IOException { return createJettyHTTPServerEngine(host, port, protocol, null); } ->>>>>>> e70c78e... CXF-7299 - No way to configure TLS for the JettyHTTPServerEngineFactory in code /** * This method removes the Server Engine from the port map and stops it. */
