Change events delivery

Signed-off-by: Alexander Pinčuk <alexander.v.pinchuk@gmail.com>
eclipse-ee4j · Mar 14, 2024 · 9da4571 · 9da4571
1 parent 76174ff
commit 9da4571
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/event/EventsImpl.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/event/EventsImpl.java
@@ -86,10 +86,18 @@ public void send(final Event<?> event, boolean asynchronously) {
                 continue;
             }
 
-            RestrictTo restrictTo = eventMethod.getParameters()[0].getAnnotation(RestrictTo.class);
-            if (restrictTo != null) {
-                EventTypes<?> interested = EventTypes.create(restrictTo.value());
-                if (!event.is(interested)) {
+            RestrictTo[] restrictTo = eventMethod.getParameters()[0].getAnnotationsByType(RestrictTo.class);
+            if (restrictTo.length > 0) {
+                boolean isInterested = false;
+                for (RestrictTo restrict : restrictTo) {
+                    EventTypes<?> interestedEvent = EventTypes.create(restrict.value());
+                    if (event.is(interestedEvent)) {
+                        isInterested = true;
+                        break;
+                    }
+                }
+
+                if (!isInterested) {
                     continue;
                 }
             }