Avoid creating unnecessary CreationalContext instances for non-depend…

…ent beans
weld · Aug 4, 2023 · ecb8d45 · ecb8d45
1 parent 800fea3
commit ecb8d45
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java b/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java
@@ -663,18 +663,17 @@ private Context internalGetContext(Class<? extends Annotation> scopeType) {
     }
 
     public Object getReference(Bean<?> bean, Type requestedType, CreationalContext<?> creationalContext, boolean noProxy) {
-        if (creationalContext instanceof CreationalContextImpl<?>) {
+        if (creationalContext == null) {
+            // null CC indicates we need to create a new one that has no parent linked to it
+            creationalContext = createCreationalContext(null);
+        } else if (creationalContext instanceof CreationalContextImpl<?>) {
             creationalContext = ((CreationalContextImpl<?>) creationalContext).getCreationalContext(bean);
         }
         if (!noProxy && isProxyRequired(bean)) {
-            if (creationalContext != null || ContextualInstance.getIfExists(bean, this) != null) {
-                if (requestedType == null) {
-                    return clientProxyProvider.getClientProxy(bean);
-                } else {
-                    return clientProxyProvider.getClientProxy(bean, requestedType);
-                }
+            if (requestedType == null) {
+                return clientProxyProvider.getClientProxy(bean);
             } else {
-                return null;
+                return clientProxyProvider.getClientProxy(bean, requestedType);
             }
         } else {
             return ContextualInstance.get(bean, this, creationalContext);
@@ -782,7 +781,7 @@ public Object getInjectableReference(InjectionPoint injectionPoint, Bean<?> reso
             if (Dependent.class.equals(resolvedBean.getScope())) {
                 return getReference(resolvedBean, requestedType, creationalContext, delegateInjectionPoint);
             } else {
-                return getReference(resolvedBean, requestedType, createCreationalContext(null), delegateInjectionPoint);
+                return getReference(resolvedBean, requestedType, null, delegateInjectionPoint);
             }
 
         } finally {