You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2009/12/21 19:16:10 UTC
svn commit: r892914 -
/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
Author: struberg
Date: Mon Dec 21 18:16:10 2009
New Revision: 892914
URL: http://svn.apache.org/viewvc?rev=892914&view=rev
Log:
OWB-206 since NormalScoped beans always need a proxy per definition, we must remove the retrieval of the unproxied bean instances.
Modified:
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=892914&r1=892913&r2=892914&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Mon Dec 21 18:16:10 2009
@@ -68,6 +68,7 @@
import org.apache.webbeans.config.OpenWebBeansConfiguration;
import org.apache.webbeans.config.WebBeansFinder;
import org.apache.webbeans.context.ContextFactory;
+import org.apache.webbeans.context.WebBeansContext;
import org.apache.webbeans.context.creational.CreationalContextFactory;
import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.decorator.DecoratorComparator;
@@ -676,13 +677,6 @@
//Scope is normal
if (WebBeansUtil.isScopeTypeNormal(bean.getScope()))
{
- instance = context.get(bean);
-
- if(instance != null)
- {
- return instance;
- }
-
instance = getEjbOrJmsProxyReference(bean, beanType,creationalContext);
if(instance != null)
@@ -699,7 +693,7 @@
else
{
instance = JavassistProxyFactory.createNewProxyInstance(bean,creationalContext);
- this.proxyMap.put(bean, instance);
+ this.proxyMap.put(bean, instance);
}
}
}