camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [2/3] git commit: Fixed null issue when using camel-cdi with weld SE 2.0 with thanks to Shay
Date Mon, 16 Sep 2013 03:42:17 GMT
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/56ae0c42
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/56ae0c42
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/56ae0c42

Branch: refs/heads/master
Commit: 56ae0c42765efa934737991f2b2c8590736630fa
Parents: a370257
Author: Willem Jiang <ningjiang@apache.org>
Authored: Mon Sep 16 11:04:34 2013 +0800
Committer: Willem Jiang <ningjiang@apache.org>
Committed: Mon Sep 16 11:04:34 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/56ae0c42/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


Mime
View raw message