You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/09/04 04:25:03 UTC
[camel] branch master updated: CAMEL-15493 - Switched bean class
package equality test in CdiCamelExtension.shouldDeployDefaultCamelContext
so that getClass().getPackage() on the class instance comes first since
it's guaranteed to be non-null. (#4156)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 3d3b294 CAMEL-15493 - Switched bean class package equality test in CdiCamelExtension.shouldDeployDefaultCamelContext so that getClass().getPackage() on the class instance comes first since it's guaranteed to be non-null. (#4156)
3d3b294 is described below
commit 3d3b294ae7ac03cdcaf14939629a510515a26ab3
Author: Kent Fung <ke...@fung.id.au>
AuthorDate: Fri Sep 4 14:20:07 2020 +1000
CAMEL-15493 - Switched bean class package equality test in CdiCamelExtension.shouldDeployDefaultCamelContext so that getClass().getPackage() on the class instance comes first since it's guaranteed to be non-null. (#4156)
---
.../src/main/java/org/apache/camel/cdi/CdiCamelExtension.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
index 0d32f8c..c387f85 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
@@ -325,7 +325,7 @@ public class CdiCamelExtension implements Extension {
return beans.stream()
// Is there a Camel bean with the @Default qualifier?
// Excluding internal components...
- .filter(bean -> !bean.getBeanClass().getPackage().equals(getClass().getPackage()))
+ .filter(bean -> !getClass().getPackage().equals(bean.getBeanClass().getPackage()))
.filter(hasType(CamelContextAware.class).or(hasType(Component.class))
.or(hasType(RouteContainer.class).or(hasType(RoutesBuilder.class))))
.map(Bean::getQualifiers)
@@ -345,7 +345,7 @@ public class CdiCamelExtension implements Extension {
// Or an injection point for Camel primitives?
|| beans.stream()
// Excluding internal components...
- .filter(bean -> !bean.getBeanClass().getPackage().equals(getClass().getPackage()))
+ .filter(bean -> !getClass().getPackage().equals(bean.getBeanClass().getPackage()))
.map(Bean::getInjectionPoints)
.flatMap(Set::stream)
.filter(ip -> getRawType(ip.getType()).getName().startsWith("org.apache.camel"))