camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: Fixed test and use not deprecated method
Date Sat, 09 Jan 2016 09:21:50 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 9311f8254 -> 4137bc6e4


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/4137bc6e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4137bc6e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4137bc6e

Branch: refs/heads/camel-2.16.x
Commit: 4137bc6e4ef91235b5e909aef909842a6aa24b54
Parents: 9311f82
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sat Jan 9 10:05:19 2016 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sat Jan 9 10:21:42 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/4137bc6e/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 6778bbc..adeb3c8 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/4137bc6e/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 b35575a..76a457d 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
@@ -34,9 +34,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());
@@ -49,8 +50,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;
     }
     


Mime
View raw message