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 11654200B7A for ; Mon, 5 Sep 2016 09:17:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0FD96160ACC; Mon, 5 Sep 2016 07:17:33 +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 57042160ACB for ; Mon, 5 Sep 2016 09:17:32 +0200 (CEST) Received: (qmail 36098 invoked by uid 500); 5 Sep 2016 07:17:31 -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 36088 invoked by uid 99); 5 Sep 2016 07:17:31 -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, 05 Sep 2016 07:17:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 34297E7E30; Mon, 5 Sep 2016 07:17:31 +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, 05 Sep 2016 07:17:32 -0000 Message-Id: <187e5128bc1f46a4a3e73415cef45fb0@git.apache.org> In-Reply-To: <3ff92316a3f3481cbf8746b5adf1df2b@git.apache.org> References: <3ff92316a3f3481cbf8746b5adf1df2b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] camel git commit: Fixed CS. This closes #1152 archived-at: Mon, 05 Sep 2016 07:17:33 -0000 Fixed CS. This closes #1152 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3ee311ab Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3ee311ab Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3ee311ab Branch: refs/heads/master Commit: 3ee311ab8790f743b1e7b85ed02bb3c53cfe339d Parents: dfb4960 Author: Claus Ibsen Authored: Mon Sep 5 09:17:14 2016 +0200 Committer: Claus Ibsen Committed: Mon Sep 5 09:17:14 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/camel/impl/DefaultCamelContext.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3ee311ab/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java index 92935d9..8cf7a78 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java @@ -407,17 +407,16 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon } public Component getComponent(String name, boolean autoCreateComponents, boolean autoStart) { - // CAMEL-10269 : Atomic operation to get/create a component. Avoid global locks. + // atomic operation to get/create a component. Avoid global locks. return components.computeIfAbsent(name, comp -> initComponent(name, autoCreateComponents, autoStart)); } - /* - * CAMEL-10269 + /** * Function to initialize a component and auto start. Returns null if the autoCreateComponents is disabled */ private Component initComponent(String name, boolean autoCreateComponents, boolean autoStart) { Component component = null; - if(autoCreateComponents) { + if (autoCreateComponents) { try { if (log.isDebugEnabled()) { log.debug("Using ComponentResolver: {} to resolve component with name: {}", getComponentResolver(), name);