Repository: camel Updated Branches: refs/heads/master a6fce3d99 -> d5253916c
Minor update to start making things easier for Jetty9 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/22f62928 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/22f62928 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/22f62928 Branch: refs/heads/master Commit: 22f629287623f6d78625ef264281a2f4f21eb18f Parents: 4c69278 Author: Daniel Kulp <dk...@apache.org> Authored: Thu Aug 14 09:09:08 2014 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Thu Aug 14 09:09:24 2014 -0400 ---------------------------------------------------------------------- .../camel/component/jetty/JettyHttpComponent.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/22f62928/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java index 4f0e5b8..0c51eb6d 100644 --- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java +++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java @@ -486,8 +486,8 @@ public class JettyHttpComponent extends HttpComponent implements RestConsumerFac return sslKeystore; } - protected SslSelectChannelConnector getSslSocketConnector(JettyHttpEndpoint endpoint) throws Exception { - SslSelectChannelConnector answer = null; + protected Connector getSslSocketConnector(JettyHttpEndpoint endpoint) throws Exception { + Connector answer = null; if (sslSocketConnectors != null) { answer = sslSocketConnectors.get(endpoint.getPort()); } @@ -497,7 +497,7 @@ public class JettyHttpComponent extends HttpComponent implements RestConsumerFac return answer; } - protected SslSelectChannelConnector createSslSocketConnector(JettyHttpEndpoint endpoint) throws Exception { + protected Connector createSslSocketConnector(JettyHttpEndpoint endpoint) throws Exception { SslSelectChannelConnector answer = null; // Note that this was set on the endpoint when it was constructed. It was @@ -642,8 +642,8 @@ public class JettyHttpComponent extends HttpComponent implements RestConsumerFac sslSocketConnectors = connectors; } - public SelectChannelConnector getSocketConnector(int port) throws Exception { - SelectChannelConnector answer = null; + public Connector getSocketConnector(int port) throws Exception { + Connector answer = null; if (socketConnectors != null) { answer = socketConnectors.get(port); } @@ -653,7 +653,7 @@ public class JettyHttpComponent extends HttpComponent implements RestConsumerFac return answer; } - protected SelectChannelConnector createSocketConnector() throws Exception { + protected Connector createSocketConnector() throws Exception { SelectChannelConnector answer = new SelectChannelConnector(); if (getSocketConnectorProperties() != null) { // must copy the map otherwise it will be deleted
