Updated Branches: refs/heads/camel-2.11.x 4f5537764 -> aebe52774
Fixed null issue when using camel-cdi with weld SE 2.0 with thanks to Shay Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1d35c4c1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1d35c4c1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1d35c4c1 Branch: refs/heads/camel-2.11.x Commit: 1d35c4c1269f31834551f90bc0e7d4070a454940 Parents: 4f55377 Author: Willem Jiang <ningji...@apache.org> Authored: Mon Sep 16 11:04:34 2013 +0800 Committer: Willem Jiang <ningji...@apache.org> Committed: Mon Sep 16 11:48:33 2013 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/camel/cdi/internal/CamelContextBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1d35c4c1/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java ---------------------------------------------------------------------- diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java index 3411d3d..7e97f66 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java @@ -115,7 +115,7 @@ public class CamelContextBean implements Bean<CdiCamelContext> { @Override public Set<Class<? extends Annotation>> getStereotypes() { - return null; + return new HashSet<Class<? extends Annotation>>(); } @Override
