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 2D6FD200B64 for ; Tue, 2 Aug 2016 08:49:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2C3BF160A8C; Tue, 2 Aug 2016 06:49:21 +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 6A2D8160AA8 for ; Tue, 2 Aug 2016 08:49:20 +0200 (CEST) Received: (qmail 99712 invoked by uid 500); 2 Aug 2016 06:49:19 -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 99650 invoked by uid 99); 2 Aug 2016 06:49:19 -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; Tue, 02 Aug 2016 06:49:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 289C2EEE18; Tue, 2 Aug 2016 06:49:19 +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: Tue, 02 Aug 2016 06:49:24 -0000 Message-Id: <858684c278b144e9a8e343237f020ffe@git.apache.org> In-Reply-To: <9c141c83e7cc4178b021f0fce63e7c0f@git.apache.org> References: <9c141c83e7cc4178b021f0fce63e7c0f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] camel git commit: CAMEL-10215: Fixed CS. This closes #1099 archived-at: Tue, 02 Aug 2016 06:49:21 -0000 CAMEL-10215: Fixed CS. This closes #1099 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/52e46f46 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/52e46f46 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/52e46f46 Branch: refs/heads/camel-2.16.x Commit: 52e46f4660ce8d9c58595a6e6fe582c8ef3ae09e Parents: 1b25ee2 Author: Claus Ibsen Authored: Tue Aug 2 08:48:13 2016 +0200 Committer: Claus Ibsen Committed: Tue Aug 2 08:49:08 2016 +0200 ---------------------------------------------------------------------- .../org/apache/camel/impl/EventDrivenPollingConsumer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/52e46f46/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java b/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java index 117598f..4e02b66 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java +++ b/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java @@ -114,8 +114,8 @@ public class EventDrivenPollingConsumer extends PollingConsumerSupport implement } while (isRunAllowed()) { - // CAMEL-10215 - Synchronizing the ordering of beforePoll, poll and afterPoll as an atomic activity - synchronized(this) { + // synchronizing the ordering of beforePoll, poll and afterPoll as an atomic activity + synchronized (this) { try { beforePoll(0); // take will block waiting for message @@ -137,8 +137,8 @@ public class EventDrivenPollingConsumer extends PollingConsumerSupport implement throw new RejectedExecutionException(this + " is not started, but in state: " + getStatus().name()); } - // CAMEL-10215 - Synchronizing the ordering of beforePoll, poll and afterPoll as an atomic activity - synchronized(this) { + // synchronizing the ordering of beforePoll, poll and afterPoll as an atomic activity + synchronized (this) { try { // use the timeout value returned from beforePoll timeout = beforePoll(timeout);