WELD-2721 Change AfterBeanDiscoveryImpl to correctly check the state …

…of invocation before making assumptions about it
weld · Jun 8, 2022 · 8ab35ef · 8ab35ef
1 parent eee420a
commit 8ab35ef
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java b/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java
@@ -102,7 +102,9 @@ public void addBean(Bean<?> bean) {
 
     @Override
     public <T> WeldBeanConfigurator<T> addBean() {
-        return addBean(getReceiver().getClass());
+        // null is only going to occur if the invocation is outside of OM in which case it will fail in the
+        // subsequent method inside checkWithinObserverNotification()
+        return addBean(getReceiver() != null ? getReceiver().getClass() : null);
     }
 
     /**