This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 3948f21f9799ee7756255cb7b0b53b40eaef3cd2 Author: Mark Struberg <[email protected]> AuthorDate: Mon Mar 1 10:54:24 2021 +0100 OWB-1373 revert back to NotificationManager Seems there have been quite a few changes which require to have the NotificationManager also delegate the Parent BeanManagers NotificationManager. I removed the finally flag from it yesterday already. Now we can overload it in TomEE and fix it properly over there. --- .../src/main/java/org/apache/webbeans/event/EventImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java index 0d3f381..5f7b71f 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java @@ -177,7 +177,7 @@ public class EventImpl<T> implements Event<T>, Serializable if (defaultMetadataObservers == null) { final List<ObserverMethod<? super Object>> tmp = new ArrayList<>( // faster than LinkedList - webBeansContext.getBeanManagerImpl().resolveObserverMethods(event, metadata)); + notificationManager.resolveObservers(event, metadata, false)); notificationManager.prepareObserverListForFire(false, false, tmp); this.defaultMetadataObservers = tmp; } @@ -206,7 +206,7 @@ public class EventImpl<T> implements Event<T>, Serializable if (observerMethods == null) { observerMethods = new ArrayList<>( // faster than LinkedList - webBeansContext.getBeanManagerImpl().resolveObserverMethods(event, metadata)); + notificationManager.resolveObservers(event, metadata, false)); notificationManager.prepareObserverListForFire(false, false, observerMethods); this.observers.putIfAbsent(key, observerMethods); } @@ -223,7 +223,7 @@ public class EventImpl<T> implements Event<T>, Serializable if (defaultMetadataAsyncObservers == null) { final List<ObserverMethod<? super Object>> tmp = new ArrayList<>( // faster than LinkedList - webBeansContext.getBeanManagerImpl().resolveObserverMethods(event, metadata)); + notificationManager.resolveObservers(event, metadata, false)); notificationManager.prepareObserverListForFire(false, true, tmp); this.defaultMetadataAsyncObservers = tmp; } @@ -252,7 +252,7 @@ public class EventImpl<T> implements Event<T>, Serializable if (observerMethods == null) { observerMethods = new ArrayList<>( // faster than LinkedList - webBeansContext.getBeanManagerImpl().resolveObserverMethods(event, metadata)); + notificationManager.resolveObservers(event, metadata, false)); notificationManager.prepareObserverListForFire(false, true, observerMethods); this.asyncObservers.putIfAbsent(key, observerMethods); }
