Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8E385200C37 for ; Sun, 5 Feb 2017 12:16:16 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8CF4F160B32; Sun, 5 Feb 2017 11:16:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AF799160B6C for ; Sun, 5 Feb 2017 12:16:15 +0100 (CET) Received: (qmail 12462 invoked by uid 500); 5 Feb 2017 11:16:14 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 11849 invoked by uid 99); 5 Feb 2017 11:16:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Feb 2017 11:16:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A5517DFB0E; Sun, 5 Feb 2017 11:16:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Sun, 05 Feb 2017 11:16:19 -0000 Message-Id: <2ccfeb1938fc46c8a51b4a3f24376cd4@git.apache.org> In-Reply-To: <43b97f87a25b4425b914dc8f3ae9e0e0@git.apache.org> References: <43b97f87a25b4425b914dc8f3ae9e0e0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/7] camel git commit: CAMEL-10788 : Fixed checkstyle archived-at: Sun, 05 Feb 2017 11:16:16 -0000 CAMEL-10788 : Fixed checkstyle Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/be2097a1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/be2097a1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/be2097a1 Branch: refs/heads/camel-2.17.x Commit: be2097a16447a454e24696331f69eaa19cd4ac04 Parents: 3618b97 Author: Ton Swieb Authored: Sat Feb 4 22:35:27 2017 +0100 Committer: Claus Ibsen Committed: Sun Feb 5 10:10:57 2017 +0100 ---------------------------------------------------------------------- .../component/jetty/JettyHttpComponent.java | 23 ++++++++++---------- .../camel/component/jetty/HandlerTest.java | 10 ++++----- 2 files changed, 16 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/be2097a1/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 c5d13ed..c7e5104 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 @@ -1155,18 +1155,17 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements } protected boolean isHandlerInChain(Handler current, Handler handler) { - - if (handler.equals(current)) { - //Found a match in the chain - return true; - } else if (current instanceof HandlerWrapper) { - //Inspect the next handler in the chain - return isHandlerInChain(((HandlerWrapper) current).getHandler(), handler); - } else { - //End of chain - return false; - } - + + if (handler.equals(current)) { + //Found a match in the chain + return true; + } else if (current instanceof HandlerWrapper) { + //Inspect the next handler in the chain + return isHandlerInChain(((HandlerWrapper) current).getHandler(), handler); + } else { + //End of chain + return false; + } } protected Server createServer() { http://git-wip-us.apache.org/repos/asf/camel/blob/be2097a1/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HandlerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HandlerTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HandlerTest.java index 7f309a9..a88c11e 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HandlerTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HandlerTest.java @@ -119,11 +119,11 @@ public class HandlerTest extends BaseJettyTest { } }); from("jetty:http://localhost:" + port2 + "/endpoint2?handlers=#statisticsHandler2,#statisticsHandler3") - .process(new Processor() { - public void process(Exchange exchange) throws Exception { - exchange.getOut().setBody(htmlResponse); - } - }); + .process(new Processor() { + public void process(Exchange exchange) throws Exception { + exchange.getOut().setBody(htmlResponse); + } + }); }; }; }