Repository: camel Updated Branches: refs/heads/camel-2.13.x da30a0d69 -> 6e063c2f6 refs/heads/master 350df8d53 -> 9bae4b23d
CAMEL-7312: File -> Serializable should covert to byte[] first to use a reliable convertion pattern. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9bae4b23 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9bae4b23 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9bae4b23 Branch: refs/heads/master Commit: 9bae4b23d94d4f6ffbf12cbb595743cefc408f48 Parents: 350df8d Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Mar 28 13:42:28 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Mar 28 13:42:55 2014 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/file/GenericFileConverter.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9bae4b23/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java index aaed06f..4dce79a 100644 --- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java +++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java @@ -151,7 +151,11 @@ public final class GenericFileConverter { // load the file using input stream InputStream is = genericFileToInputStream(file, exchange); if (is != null) { - return exchange.getContext().getTypeConverter().convertTo(Serializable.class, exchange, is); + // need to double convert to convert correctly + byte[] data = exchange.getContext().getTypeConverter().convertTo(byte[].class, exchange, is); + if (data != null) { + return exchange.getContext().getTypeConverter().convertTo(Serializable.class, exchange, data); + } } } // should revert to fallback converter if we don't have an exchange
