Repository: camel Updated Branches: refs/heads/master c59787bc7 -> 90e82c42c
camel-csv should use try converter first Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/90e82c42 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/90e82c42 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/90e82c42 Branch: refs/heads/master Commit: 90e82c42c1895e070bb0ea4c13830b38fec461b7 Parents: c59787b Author: Claus Ibsen <[email protected]> Authored: Mon Jul 27 14:47:18 2015 +0200 Committer: Claus Ibsen <[email protected]> Committed: Mon Jul 27 14:47:18 2015 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/90e82c42/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java index dedc982..d04fb0c 100644 --- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java +++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java @@ -74,7 +74,7 @@ abstract class CsvMarshaller { public void marshal(Exchange exchange, Object object, OutputStream outputStream) throws NoTypeConversionAvailableException, IOException { CSVPrinter printer = new CSVPrinter(new OutputStreamWriter(outputStream), format); try { - List<?> list = ExchangeHelper.convertToType(exchange, List.class, object); + List<?> list = exchange.getContext().getTypeConverter().tryConvertTo(List.class, exchange, object); if (list != null) { for (Object child : list) { printer.printRecord(getRecordValues(exchange, child)); @@ -88,7 +88,7 @@ abstract class CsvMarshaller { } private Iterable<?> getRecordValues(Exchange exchange, Object data) throws NoTypeConversionAvailableException { - Map<?, ?> map = ExchangeHelper.convertToType(exchange, Map.class, data); + Map<?, ?> map = exchange.getContext().getTypeConverter().tryConvertTo(Map.class, exchange, data); if (map != null) { return getMapRecordValues(map); }
