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:20:29 UTC
[camel] branch camel-3.4.x 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 camel-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.4.x by this push:
new ce2bf7a 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)
ce2bf7a is described below
commit ce2bf7a09e5681255858af6516d4ee43bdc1b5f8
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 ad64f8d..8aeb938 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
@@ -317,7 +317,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)
@@ -337,7 +337,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"))