Return-Path: 
 <commits-return-45416-apmail-camel-commits-archive=camel.apache.org@camel.apache.org>
X-Original-To: apmail-camel-commits-archive@www.apache.org
Delivered-To: apmail-camel-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 256F218493
	for <apmail-camel-commits-archive@www.apache.org>;
 Mon,  4 Jan 2016 14:35:50 +0000 (UTC)
Received: (qmail 17529 invoked by uid 500); 4 Jan 2016 14:35:50 -0000
Delivered-To: apmail-camel-commits-archive@camel.apache.org
Received: (qmail 17443 invoked by uid 500); 4 Jan 2016 14:35:49 -0000
Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@camel.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@camel.apache.org>
List-Post: <mailto:commits@camel.apache.org>
List-Id: <commits.camel.apache.org>
Reply-To: dev@camel.apache.org
Delivered-To: mailing list commits@camel.apache.org
Received: (qmail 17095 invoked by uid 99); 4 Jan 2016 14:35:49 -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; Mon, 04 Jan 2016 14:35:49 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 94BD2E0547; Mon,  4 Jan 2016 14:35:49 +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: Mon, 04 Jan 2016 14:35:57 -0000
Message-Id: <e1079afd37c84d379d10d5e98859871e@git.apache.org>
In-Reply-To: <4d4aeb85d7bb4433894ab2271b065f17@git.apache.org>
References: <4d4aeb85d7bb4433894ab2271b065f17@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [09/10] camel git commit: Add missing options in component docs

Add missing options in component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/23cd70e2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/23cd70e2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/23cd70e2

Branch: refs/heads/master
Commit: 23cd70e23e30f4d9c00f312e0ca5e7b1967e946a
Parents: f633475
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Mon Jan 4 15:28:14 2016 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Jan 4 15:28:14 2016 +0100

----------------------------------------------------------------------
 .../org/apache/camel/component/jetty/JettyHttpComponent.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/23cd70e2/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 325a799..833bf95 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
@@ -164,6 +164,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
 
         // must extract well known parameters before we create the endpoint
+        List<Handler> handlerList = resolveAndRemoveReferenceListParameter(parameters, "handlers", Handler.class);
         HttpBinding binding = resolveAndRemoveReferenceParameter(parameters, "httpBindingRef", HttpBinding.class);
         JettyHttpBinding jettyBinding = resolveAndRemoveReferenceParameter(parameters, "jettyHttpBindingRef", JettyHttpBinding.class);
         Boolean enableJmx = getAndRemoveParameter(parameters, "enableJmx", Boolean.class);
@@ -220,7 +221,9 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
         if (httpClientParameters != null && !httpClientParameters.isEmpty()) {
             endpoint.setHttpClientParameters(httpClientParameters);
         }
-        // prefer to use endpoint configured over component configured
+        if (handlerList.size() > 0) {
+            endpoint.setHandlers(handlerList);
+        }        // prefer to use endpoint configured over component configured
         if (binding == null) {
             // fallback to component configured
             binding = getHttpBinding();