Repository: camel Updated Branches: refs/heads/camel-2.18.x 92630afb2 -> 8092484fc refs/heads/master 2dda57ef9 -> abb08fa9b
CAMEL-10385: capture all structures of type collection Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8092484f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8092484f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8092484f Branch: refs/heads/camel-2.18.x Commit: 8092484fc0561811f962463b65e42907b0e18ba2 Parents: 22816c5 Author: dmitriy <xhu...@gmail.com> Authored: Thu Oct 13 17:28:55 2016 -0400 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Oct 14 09:32:47 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/spring/boot/SpringTypeConverter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8092484f/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java index 3818148..5f4021a 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java @@ -16,11 +16,11 @@ */ package org.apache.camel.spring.boot; +import java.util.Collection; import java.util.List; import java.util.Map; import org.apache.camel.Exchange; -import org.apache.camel.StreamCache; import org.apache.camel.TypeConversionException; import org.apache.camel.support.TypeConverterSupport; import org.springframework.beans.factory.annotation.Autowired; @@ -43,7 +43,7 @@ public class SpringTypeConverter extends TypeConverterSupport { } // do not attempt to convert List -> Map. Ognl expression may use this converter as a fallback expecting null - if (type.isAssignableFrom(Map.class) && (value.getClass().isArray() || value instanceof List)) { + if (type.isAssignableFrom(Map.class) && (value.getClass().isArray() || value instanceof Collection)) { return null; }
