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 C07FB10B07 for ; Fri, 31 Jan 2014 16:09:07 +0000 (UTC) Received: (qmail 10361 invoked by uid 500); 31 Jan 2014 16:08:59 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 10125 invoked by uid 500); 31 Jan 2014 16:08:57 -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 10108 invoked by uid 99); 31 Jan 2014 16:08:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jan 2014 16:08:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 43AB1917D46; Fri, 31 Jan 2014 16:08:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: janstey@apache.org To: commits@camel.apache.org Date: Fri, 31 Jan 2014 16:08:56 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/8] git commit: Guard log statement against null obj Updated Branches: refs/heads/camel-2.10.x d6ccae162 -> 8440e7002 refs/heads/camel-2.11.x 6a911be6e -> 47a3c2648 refs/heads/camel-2.12.x b855e8a73 -> 369b95534 refs/heads/master 033f9dde0 -> 59cce7e97 Guard log statement against null obj Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/174c0806 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/174c0806 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/174c0806 Branch: refs/heads/master Commit: 174c0806d0f14f749baedcf4efa5bd86d6a8c852 Parents: 033f9dd Author: Jonathan Anstey Authored: Fri Jan 31 12:22:49 2014 -0330 Committer: Jonathan Anstey Committed: Fri Jan 31 12:32:59 2014 -0330 ---------------------------------------------------------------------- .../java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/174c0806/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java index 29b3bcf..8c2bb9a 100755 --- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java +++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java @@ -258,7 +258,8 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor if (model.containsKey(clazz.getName())) { Object obj = model.get(clazz.getName()); - if (LOG.isDebugEnabled()) { + + if (obj != null && LOG.isDebugEnabled()) { LOG.debug("Model object: {}, class: {}", obj, obj.getClass().getName()); } if (obj != null) {