You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/11/20 18:12:44 UTC
tomee git commit: wrong argument, wrong result,
fixing ear cdi event check
Repository: tomee
Updated Branches:
refs/heads/develop eb13cfaa3 -> 23e40ce89
wrong argument, wrong result, fixing ear cdi event check
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/23e40ce8
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/23e40ce8
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/23e40ce8
Branch: refs/heads/develop
Commit: 23e40ce894e607074dd742d802a94167ac07931a
Parents: eb13cfa
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Thu Nov 20 18:01:53 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Thu Nov 20 18:01:53 2014 +0100
----------------------------------------------------------------------
.../org/apache/openejb/cdi/WebappBeanManager.java | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/23e40ce8/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
index dd07685..392b3ca 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java
@@ -59,20 +59,18 @@ public class WebappBeanManager extends BeanManagerImpl {
@Override
public void fireEvent(final Object event, final EventMetadataImpl metadata, final boolean isLifecycleEvent) {
- final Class<?> eventClass = event.getClass();
getNotificationManager().fireEvent(event, metadata, isLifecycleEvent);
- if (isEvent(eventClass)) {
+ if (isEvent(event)) {
getParentBm().getNotificationManager().fireEvent(event, metadata, isLifecycleEvent);
}
}
@Override
public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(final T event, final EventMetadataImpl metadata) {
- final Class<?> eventClass = event.getClass();
final Set<ObserverMethod<? super T>> set = new HashSet<>();
set.addAll(getNotificationManager().resolveObservers(event, metadata, false));
- if (isEvent(eventClass)) {
+ if (isEvent(event)) {
set.addAll(getParentBm().getNotificationManager().resolveObservers(event, metadata, false));
} // else nothing since extensions are loaded by classloader so we already have it
@@ -260,6 +258,11 @@ public class WebappBeanManager extends BeanManagerImpl {
}
@Override
+ public <T> void addAdditionalAnnotatedType(Object extension, AnnotatedType<T> inAnnotatedType, String id) {
+ super.addAdditionalAnnotatedType(extension, inAnnotatedType, id);
+ }
+
+ @Override
public Bean<?> getPassivationCapableBean(final String id) {
final Bean<?> bean = super.getPassivationCapableBean(id);
if (bean == null) {
@@ -289,9 +292,9 @@ public class WebappBeanManager extends BeanManagerImpl {
// no-op
}
- private boolean isEvent(final Class<?> eventClass) {
- return !WebBeansUtil.isDefaultExtensionBeanEventType(eventClass)
- && !webappCtx.getWebBeansUtil().isContainerEventType(eventClass);
+ private boolean isEvent(final Object event) {
+ return !WebBeansUtil.isDefaultExtensionBeanEventType(event.getClass())
+ && !webappCtx.getWebBeansUtil().isContainerEventType(event);
}
private interface Filter<A> {