OWB - correct unproxy instance

HotswapProjects · Jun 18, 2020 · 7bf4c58 · 7bf4c58
1 parent 317f2e8
commit 7bf4c58
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/...-owb-plugin/src/main/java/org/hotswap/agent/plugin/owb/command/BeanClassRefreshAgent.java b/...-owb-plugin/src/main/java/org/hotswap/agent/plugin/owb/command/BeanClassRefreshAgent.java
@@ -55,7 +55,9 @@
 import org.apache.webbeans.container.InjectableBeanManager;
 import org.apache.webbeans.container.InjectionTargetFactoryImpl;
 import org.apache.webbeans.portable.AnnotatedElementFactory;
+import org.apache.webbeans.proxy.NormalScopeProxyFactory;
 import org.apache.webbeans.proxy.OwbInterceptorProxy;
+import org.apache.webbeans.proxy.OwbNormalScopeProxy;
 import org.apache.webbeans.spi.BeanArchiveService.BeanArchiveInformation;
 import org.apache.webbeans.spi.BeanArchiveService.BeanDiscoveryMode;
 import org.hotswap.agent.logging.AgentLogger;
@@ -257,6 +259,7 @@ private static void createAnnotatedTypeForExistingBeanClass(BeanManagerImpl bean
     private static void doReinjectRegisteredBeanInstances(BeanManagerImpl beanManager, InjectionTargetBean bean) {
         for (Object instance: HaCdiCommons.getBeanInstances(bean)) {
             if (instance != null) {
+                instance = unwrapInstance(beanManager, instance);
                 bean.getProducer().inject(instance, beanManager.createCreationalContext(bean));
                 LOGGER.info("Bean '{}' injection points was reinjected.", bean.getBeanClass().getName());
             } else {
@@ -269,15 +272,22 @@ private static void doReinjectRegisteredBeanInstances(BeanManagerImpl beanManage
     private static void doReinjectBeanInstance(BeanManagerImpl beanManager, InjectionTargetBean bean, Context context) {
         Object instance = context.get(bean);
         if (instance != null) {
-            if (instance instanceof OwbInterceptorProxy) {
-                instance = beanManager.getWebBeansContext().getInterceptorDecoratorProxyFactory().unwrapInstance(instance);
-            }
-
+            instance = unwrapInstance(beanManager, instance);
             bean.getProducer().inject(instance, beanManager.createCreationalContext(bean));
             LOGGER.info("Bean '{}' injection points was reinjected.", bean.getBeanClass().getName());
         }
     }
 
+    private static Object unwrapInstance(BeanManagerImpl beanManager, Object instance) {
+        if (instance instanceof OwbNormalScopeProxy) {
+            instance = NormalScopeProxyFactory.unwrapInstance(instance);
+        }
+        if (instance instanceof OwbInterceptorProxy) {
+            instance = beanManager.getWebBeansContext().getInterceptorDecoratorProxyFactory().unwrapInstance(instance);
+        }
+        return instance;
+    }
+
     private static void doReloadBeanInBeanContexts(BeanManagerImpl beanManager, InjectionTargetBean<?> bean) {
         try {
             Map<Class<? extends Annotation>, Context> singleContextMap = getSingleContextMap(beanManager);