[tomee] branch master updated: ensure WebappWebBeansContext#getInjectableBeanManager is the correct one

[rmannibucau]

This is an automated email from the ASF dual-hosted git repository.

rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/master by this push:
     new 80954e5  ensure WebappWebBeansContext#getInjectableBeanManager is the 
correct one
80954e5 is described below

commit 80954e5ee5e71d9eedaae3c8b1fbb6bac02c4901
Author: Romain Manni-Bucau <rmannibu...@gmail.com>
AuthorDate: Thu Oct 7 17:45:37 2021 +0200

    ensure WebappWebBeansContext#getInjectableBeanManager is the correct one
---
 .../src/main/java/org/apache/openejb/cdi/WebappBeanManager.java   | 1 +
 .../main/java/org/apache/openejb/cdi/WebappWebBeansContext.java   | 8 ++++++++
 2 files changed, 9 insertions(+)

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 ded4bee..fc63bf0 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
@@ -23,6 +23,7 @@ import org.apache.webbeans.component.ExtensionBean;
 import org.apache.webbeans.component.OwbBean;
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.container.BeanManagerImpl;
+import org.apache.webbeans.container.InjectableBeanManager;
 import org.apache.webbeans.context.creational.CreationalContextImpl;
 import org.apache.webbeans.event.EventMetadataImpl;
 import org.apache.webbeans.util.Asserts;
diff --git 
a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java
 
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java
index 6effb38..00bf9a5 100644
--- 
a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java
+++ 
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java
@@ -22,12 +22,14 @@ import java.util.Properties;
 
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.container.BeanManagerImpl;
+import org.apache.webbeans.container.InjectableBeanManager;
 import org.apache.webbeans.event.NotificationManager;
 
 import javax.enterprise.inject.spi.Bean;
 
 public class WebappWebBeansContext extends WebBeansContext {
     private final WebBeansContext parent;
+    private final InjectableBeanManager ibm;
     private BeanManagerImpl bm;
     private final WebappNotificationManager webappNotificationManager;
 
@@ -35,6 +37,12 @@ public class WebappWebBeansContext extends WebBeansContext {
         super(services, properties);
         parent = webBeansContext;
         webappNotificationManager = new WebappNotificationManager(this);
+        ibm = new InjectableBeanManager(getBeanManagerImpl());
+    }
+
+    @Override
+    public InjectableBeanManager getInjectableBeanManager() {
+        return ibm;
     }
 
     @SuppressWarnings("PMD.DoubleCheckedLocking")