Updated Branches: refs/heads/camel-2.11.x ce51227be -> a91c7e743 refs/heads/master b10ecf8f1 -> ee1fd85a1
CAMEL-6651 Calling processAnnotations when using the XStreamDataFormat's aliases are set Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ee1fd85a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ee1fd85a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ee1fd85a Branch: refs/heads/master Commit: ee1fd85a1efaae525597653754afb686a04a4256 Parents: b10ecf8 Author: Willem Jiang <ningji...@apache.org> Authored: Tue Aug 20 10:26:05 2013 +0800 Committer: Willem Jiang <ningji...@apache.org> Committed: Tue Aug 20 10:26:05 2013 +0800 ---------------------------------------------------------------------- .../apache/camel/dataformat/xstream/AbstractXStreamWrapper.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ee1fd85a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java ---------------------------------------------------------------------- diff --git a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java index 76d6ca7..3aa8a01 100644 --- a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java +++ b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java @@ -91,6 +91,8 @@ public abstract class AbstractXStreamWrapper implements DataFormat { if (this.aliases != null) { for (Entry<String, String> entry : this.aliases.entrySet()) { xstream.alias(entry.getKey(), resolver.resolveMandatoryClass(entry.getValue())); + // It can turn the auto-detection mode off + xstream.processAnnotations(resolver.resolveMandatoryClass(entry.getValue())); } }
