Repository: camel Updated Branches: refs/heads/master 142b90de1 -> dbb552c9e
Fixed test and use not deprecated method Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dbb552c9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dbb552c9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dbb552c9 Branch: refs/heads/master Commit: dbb552c9e6f9d56a230b9bb463f1360890009a1e Parents: 142b90d Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Jan 9 10:05:19 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Jan 9 10:05:19 2016 +0100 ---------------------------------------------------------------------- .../apache/camel/component/jetty/JettyHttpComponent.java | 3 ++- .../apache/camel/component/jetty9/JettyHttpEndpoint9.java | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/dbb552c9/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java index 833bf95..2b90a9d 100644 --- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java +++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java @@ -223,7 +223,8 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements } if (handlerList.size() > 0) { endpoint.setHandlers(handlerList); - } // prefer to use endpoint configured over component configured + } + // prefer to use endpoint configured over component configured if (binding == null) { // fallback to component configured binding = getHttpBinding(); http://git-wip-us.apache.org/repos/asf/camel/blob/dbb552c9/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java index c37908c..cdf3bba 100644 --- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java +++ b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java @@ -37,9 +37,10 @@ public class JettyHttpEndpoint9 extends JettyHttpEndpoint { public JettyHttpEndpoint9(JettyHttpComponent component, String uri, URI httpURL) throws URISyntaxException { super(component, uri, httpURL); } - + @Override - public HttpBinding getBinding() { + public HttpBinding getHttpBinding() { + // make sure we include jetty9 variant of the http binding if (this.binding == null) { this.binding = new AttachmentHttpBinding(); this.binding.setTransferException(isTransferException()); @@ -52,8 +53,8 @@ public class JettyHttpEndpoint9 extends JettyHttpEndpoint { } @Override - public void setBinding(HttpBinding binding) { - super.setBinding(binding); + public void setHttpBinding(HttpBinding binding) { + super.setHttpBinding(binding); this.binding = binding; }
