Repository: camel Updated Branches: refs/heads/master 0f6f2e32b -> 03401f085
CAMEL-7315 specify the charset when loading the converter with thanks to Knut-Olav Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/03401f08 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/03401f08 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/03401f08 Branch: refs/heads/master Commit: 03401f085ca0502f8e9c6c8e502ee2ebf2fb850f Parents: 0f6f2e3 Author: Willem Jiang <[email protected]> Authored: Fri Mar 28 16:31:54 2014 +0800 Committer: Willem Jiang <[email protected]> Committed: Fri Mar 28 16:32:14 2014 +0800 ---------------------------------------------------------------------- .../camel/impl/converter/AnnotationTypeConverterLoader.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/03401f08/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java b/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java index 74e3f0e..f493b7e 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java +++ b/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.lang.reflect.Method; import java.net.URL; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; import java.util.Enumeration; @@ -66,6 +67,7 @@ import org.slf4j.LoggerFactory; public class AnnotationTypeConverterLoader implements TypeConverterLoader { public static final String META_INF_SERVICES = "META-INF/services/org/apache/camel/TypeConverter"; private static final Logger LOG = LoggerFactory.getLogger(AnnotationTypeConverterLoader.class); + private static final Charset UTF8 = Charset.forName("UTF-8"); protected PackageScanClassResolver resolver; protected Set<Class<?>> visitedClasses = new HashSet<Class<?>>(); protected Set<String> visitedURIs = new HashSet<String>(); @@ -214,7 +216,7 @@ public class AnnotationTypeConverterLoader implements TypeConverterLoader { // remember we have visited this uri so we wont read it twice visitedURIs.add(path); LOG.debug("Loading file {} to retrieve list of packages, from url: {}", META_INF_SERVICES, url); - BufferedReader reader = IOHelper.buffered(new InputStreamReader(url.openStream())); + BufferedReader reader = IOHelper.buffered(new InputStreamReader(url.openStream(), UTF8)); try { while (true) { String line = reader.readLine();
