svn commit: r1361681 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java

[st...@apache.org]

Author: struberg
Date: Sun Jul 15 10:30:32 2012
New Revision: 1361681

URL: http://svn.apache.org/viewvc?rev=1361681&view=rev
Log:
OWB-672 a decorator is implicitely @Dependent scoped

thus we must need the ownerCreationalContext and not
create a new one. If the Decorator would have @Dependent
InjectionPoints, we would have lost this information...

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java?rev=1361681&r1=1361680&r2=1361681&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java Sun Jul 15 10:30:32 2012
@@ -28,7 +28,6 @@ import java.util.List;
 import java.util.Set;
 
 import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.Decorator;
 import org.apache.webbeans.annotation.DefaultLiteral;
@@ -155,10 +154,9 @@ public final class WebBeansDecoratorConf
             decoratorInstance = ownerCreationalContext.getDependentDecorator(instance, decorator);
             if(decoratorInstance == null)
             {
-                CreationalContext<Object> creationalContext = manager.createCreationalContext(decorator);
-                decoratorInstance = manager.getReference(decorator, decorator.getBeanClass(), creationalContext);
+                decoratorInstance = manager.getReference(decorator, decorator.getBeanClass(), ownerCreationalContext);
                 
-                decorator.setInjections(decoratorInstance, creationalContext);
+                decorator.setInjections(decoratorInstance, ownerCreationalContext);
                 decorator.setDelegate(decoratorInstance, delegate);
                 
                 ownerCreationalContext.addDependent(instance, decorator, decoratorInstance);