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 CE9D711476 for ; Thu, 22 May 2014 03:34:06 +0000 (UTC) Received: (qmail 9095 invoked by uid 500); 22 May 2014 03:34:06 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 8951 invoked by uid 500); 22 May 2014 03:34:06 -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 8935 invoked by uid 99); 22 May 2014 03:34:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 May 2014 03:34:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5BC459A0F8A; Thu, 22 May 2014 03:34:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ningjiang@apache.org To: commits@camel.apache.org Date: Thu, 22 May 2014 03:34:06 -0000 Message-Id: <3ba6bf88e088462e94bcecf07ca61770@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: CAMEL-7449 Avoiding the NPE when using camel-jms with other JMS breaker Repository: camel Updated Branches: refs/heads/camel-2.12.x 68db8a284 -> c17b1dd14 refs/heads/camel-2.13.x 7c16ae215 -> 86e9e8281 CAMEL-7449 Avoiding the NPE when using camel-jms with other JMS breaker Conflicts: components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/86e9e828 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/86e9e828 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/86e9e828 Branch: refs/heads/camel-2.13.x Commit: 86e9e8281a1b93ed9f4a115a8ffe7082ef65b5eb Parents: 7c16ae2 Author: Willem Jiang Authored: Thu May 22 11:10:53 2014 +0800 Committer: Willem Jiang Committed: Thu May 22 11:19:08 2014 +0800 ---------------------------------------------------------------------- .../org/apache/camel/component/jms/JmsBinding.java | 4 ++-- .../camel/component/jms/JmsMessageHelper.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/86e9e828/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java index b86e362..ad51e74 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java @@ -169,8 +169,8 @@ public class JmsBinding { map.put("JMSType", JmsMessageHelper.getJMSType(jmsMessage)); // this works around a bug in the ActiveMQ property handling - map.put("JMSXGroupID", jmsMessage.getStringProperty("JMSXGroupID")); - map.put("JMSXUserID", jmsMessage.getStringProperty("JMSXUserID")); + map.put("JMSXGroupID", JmsMessageHelper.getStringProperty(jmsMessage, "JMSXGroupID")); + map.put("JMSXUserID", JmsMessageHelper.getStringProperty(jmsMessage, "JMSXUserID")); } catch (JMSException e) { throw new RuntimeCamelException(e); } http://git-wip-us.apache.org/repos/asf/camel/blob/86e9e828/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java index eb125b3..24b6dee 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java @@ -300,6 +300,22 @@ public final class JmsMessageHelper { return null; } + + /** + * Gets the String Properties from the message. + * + * @param message the message + * @return the type, can be null + */ + public static String getStringProperty(Message message, String propertyName) { + try { + return message.getStringProperty(propertyName); + } catch (Exception e) { + // ignore due some broker client does not support accessing StringProperty + } + + return null; + } /** * Gets the JMSRedelivered from the message.