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 E10B719F89 for ; Wed, 16 Mar 2016 08:04:19 +0000 (UTC) Received: (qmail 94744 invoked by uid 500); 16 Mar 2016 08:04:19 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 94627 invoked by uid 500); 16 Mar 2016 08:04: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 94592 invoked by uid 99); 16 Mar 2016 08:04: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; Wed, 16 Mar 2016 08:04:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A06BFE00D8; Wed, 16 Mar 2016 08:04: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: Wed, 16 Mar 2016 08:04:21 -0000 Message-Id: In-Reply-To: <2e7bc6dcc3ae486da0c5c48e0ff1e519@git.apache.org> References: <2e7bc6dcc3ae486da0c5c48e0ff1e519@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] camel git commit: CAMEL-9714: camel-boon - Unmarshal to Map does not work CAMEL-9714: camel-boon - Unmarshal to Map does not work Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/14980a0a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/14980a0a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/14980a0a Branch: refs/heads/camel-2.16.x Commit: 14980a0a876db7f781477367a440309d96c01f01 Parents: 59fc354 Author: Claus Ibsen Authored: Wed Mar 16 08:53:00 2016 +0100 Committer: Claus Ibsen Committed: Wed Mar 16 09:04:08 2016 +0100 ---------------------------------------------------------------------- .../apache/camel/component/boon/BoonDataFormat.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/14980a0a/components/camel-boon/src/main/java/org/apache/camel/component/boon/BoonDataFormat.java ---------------------------------------------------------------------- diff --git a/components/camel-boon/src/main/java/org/apache/camel/component/boon/BoonDataFormat.java b/components/camel-boon/src/main/java/org/apache/camel/component/boon/BoonDataFormat.java index 09a5c10..11ad62a 100644 --- a/components/camel-boon/src/main/java/org/apache/camel/component/boon/BoonDataFormat.java +++ b/components/camel-boon/src/main/java/org/apache/camel/component/boon/BoonDataFormat.java @@ -22,7 +22,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.util.HashMap; import org.apache.camel.Exchange; import org.apache.camel.spi.DataFormat; @@ -44,7 +43,7 @@ public class BoonDataFormat extends ChildServiceSupport implements DataFormat, D private Class unmarshalType; public BoonDataFormat() { - this(HashMap.class); + this(null); } /** @@ -83,8 +82,16 @@ public class BoonDataFormat extends ChildServiceSupport implements DataFormat, D @Override public Object unmarshal(Exchange exchange, InputStream stream) throws Exception { BufferedReader reader = IOHelper.buffered(new InputStreamReader(stream, IOHelper.getCharsetName(exchange))); - Object result = objectMapper.fromJson(reader, this.unmarshalType); - reader.close(); + Object result; + try { + if (unmarshalType != null) { + result = objectMapper.fromJson(reader, unmarshalType); + } else { + result = objectMapper.fromJson(reader); + } + } finally { + IOHelper.close(reader); + } return result; }