Return-Path: 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 90356107F0 for ; Sat, 14 Sep 2013 10:31:43 +0000 (UTC) Received: (qmail 59725 invoked by uid 500); 14 Sep 2013 10:31:31 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 59576 invoked by uid 500); 14 Sep 2013 10:31:26 -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 59449 invoked by uid 99); 14 Sep 2013 10:31:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Sep 2013 10:31:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ED9D19046D6; Sat, 14 Sep 2013 10:31:21 +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: Sat, 14 Sep 2013 10:31:23 -0000 Message-Id: <5d4cd5b16ad740ae81ed40268102fddd@git.apache.org> In-Reply-To: <1462e1ae78cf4ce2b4f487dfb257282b@git.apache.org> References: <1462e1ae78cf4ce2b4f487dfb257282b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/6] git commit: Polished and removed old 1.x api which we no longer support in camel-hazelcast Polished and removed old 1.x api which we no longer support in camel-hazelcast Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ccb855f0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ccb855f0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ccb855f0 Branch: refs/heads/camel-2.12.x Commit: ccb855f026af839406304314252c62371b81f981 Parents: ed6e772 Author: Claus Ibsen Authored: Sat Sep 14 12:28:23 2013 +0200 Committer: Claus Ibsen Committed: Sat Sep 14 12:29:13 2013 +0200 ---------------------------------------------------------------------- .../hazelcast/listener/CamelItemListener.java | 20 ++------------------ .../hazelcast/listener/CamelListener.java | 10 ++++++---- 2 files changed, 8 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ccb855f0/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java index 1b14327..3fe1373 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelItemListener.java @@ -31,27 +31,11 @@ public class CamelItemListener extends CamelListener implements ItemListener itemEvent) { - itemAdded(itemEvent.getItem()); + this.sendExchange(HazelcastConstants.ADDED, null, itemEvent); } public void itemRemoved(ItemEvent itemEvent) { - itemRemoved(itemEvent.getItem()); + this.sendExchange(HazelcastConstants.REMOVED, null, itemEvent); } } http://git-wip-us.apache.org/repos/asf/camel/blob/ccb855f0/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java index 5264d92..e43100e 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java @@ -47,10 +47,12 @@ public class CamelListener { try { consumer.getProcessor().process(exchange); } catch (Exception e) { - if (exchange.getException() != null) { - consumer.getExceptionHandler().handleException(String.format("Error processing exchange for hazelcast consumer on object '%s' in cache '%s'.", key, cacheName), exchange, - exchange.getException()); - } + exchange.setException(e); + } + + if (exchange.getException() != null) { + consumer.getExceptionHandler().handleException(String.format("Error processing exchange for hazelcast consumer on object '%s' in cache '%s'.", key, cacheName), exchange, + exchange.getException()); } }