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 2BE4F1844F for ; Tue, 15 Mar 2016 19:55:06 +0000 (UTC) Received: (qmail 11822 invoked by uid 500); 15 Mar 2016 19:55:06 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 11774 invoked by uid 500); 15 Mar 2016 19:55: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 11765 invoked by uid 99); 15 Mar 2016 19:55:06 -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, 15 Mar 2016 19:55:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EDF49DF9F5; Tue, 15 Mar 2016 19:55:05 +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 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: camel git commit: CAMEL-9710: Avoid NPE as the class is mandatory Date: Tue, 15 Mar 2016 19:55:05 +0000 (UTC) Repository: camel Updated Branches: refs/heads/master 927bb8a4c -> 337a67564 CAMEL-9710: Avoid NPE as the class is mandatory Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/337a6756 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/337a6756 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/337a6756 Branch: refs/heads/master Commit: 337a6756480354afea7531a1a4216de9d232f211 Parents: 927bb8a Author: Claus Ibsen Authored: Tue Mar 15 20:54:57 2016 +0100 Committer: Claus Ibsen Committed: Tue Mar 15 20:54:57 2016 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/camel/component/dozer/CustomMapper.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/337a6756/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java ---------------------------------------------------------------------- diff --git a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java index 5924706..72bc783 100644 --- a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java +++ b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java @@ -73,6 +73,10 @@ public class CustomMapper extends BaseConverter { } Object mapCustom(Object source) { + if (source == null) { + return null; + } + // The converter parameter is stored in a thread local variable, so // we need to parse the parameter on each invocation // ex: custom-converter-param="org.example.MyMapping,map"