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 2015/07/10 12:01:28 UTC
camel git commit: CAMEL-6336: camel-cdi should inject the Camel
injections using inject and not post-contstruct. Thanks to Romain Manni-Bucau
for reporting.
Repository: camel
Updated Branches:
refs/heads/master 40f2341d2 -> ae8f076df
CAMEL-6336: camel-cdi should inject the Camel injections using inject and not post-contstruct. Thanks to Romain Manni-Bucau for reporting.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ae8f076d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ae8f076d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ae8f076d
Branch: refs/heads/master
Commit: ae8f076df082da44fdf9bbcef6b33a51708c8310
Parents: 40f2341
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jul 10 12:07:21 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jul 10 12:07:21 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/cdi/internal/BeanAdapter.java | 3 +--
.../java/org/apache/camel/cdi/internal/CamelExtension.java | 8 ++++----
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ae8f076d/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java
index 08ee11a..6b5284e 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java
@@ -74,8 +74,7 @@ public class BeanAdapter {
/**
* Perform injections
*/
- public void inject(CamelExtension camelExtension, Object reference,
- String beanName) {
+ public void inject(CamelExtension camelExtension, Object reference, String beanName) {
for (Method method : consumeMethods) {
Consume annotation = method.getAnnotation(Consume.class);
if (annotation != null) {
http://git-wip-us.apache.org/repos/asf/camel/blob/ae8f076d/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
index 9786a93..c50aacb 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
@@ -236,6 +236,7 @@ public class CamelExtension implements Extension {
/**
* Lets perform injection of all beans which use Camel annotations
*/
+ @SuppressWarnings("unchecked")
public void onInjectionTarget(@Observes ProcessInjectionTarget<?> event) {
final InjectionTarget injectionTarget = event.getInjectionTarget();
AnnotatedType annotatedType = event.getAnnotatedType();
@@ -246,12 +247,11 @@ public class CamelExtension implements Extension {
final BeanAdapter adapter = createBeanAdapter(beanClass, contextName);
if (!adapter.isEmpty()) {
DelegateInjectionTarget newTarget = new DelegateInjectionTarget(injectionTarget) {
-
@Override
- public void postConstruct(Object instance) {
- super.postConstruct(instance);
+ public void inject(Object instance, CreationalContext ctx) {
+ super.inject(instance, ctx);
- // now lets do the post instruct to inject our Camel injections
+ // now lets inject our Camel injections to the bean instance
adapter.inject(CamelExtension.this, instance, beanName);
}
};