You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/11/15 09:50:42 UTC
svn commit: r836341 - in
/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
container/BeanManagerImpl.java lifecycle/EnterpriseLifeCycle.java
Author: gerdogdu
Date: Sun Nov 15 08:50:41 2009
New Revision: 836341
URL: http://svn.apache.org/viewvc?rev=836341&view=rev
Log:
[OWB-165]Missing bean interception stack during TagHandler expression evaluation. Thanks to Sven Linstaedt for bug reporting.
Modified:
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/EnterpriseLifeCycle.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=836341&r1=836340&r2=836341&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 Sun Nov 15 08:50:41 2009
@@ -695,14 +695,6 @@
//Scope is normal
if (WebBeansUtil.isScopeTypeNormal(bean.getScope()))
{
- instance = context.get(beanInstance);
-
- //Instance has already exist
- if(instance != null)
- {
- return instance;
- }
-
instance = getEjbOrJmsProxyReference(beanInstance, beanType);
if(instance != null)
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/EnterpriseLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/EnterpriseLifeCycle.java?rev=836341&r1=836340&r2=836341&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/EnterpriseLifeCycle.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/EnterpriseLifeCycle.java Sun Nov 15 08:50:41 2009
@@ -14,8 +14,6 @@
package org.apache.webbeans.lifecycle;
import java.lang.annotation.Annotation;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -194,24 +192,8 @@
ServletContext context = event.getServletContext();
- try
- {
- // check this application is JSF application,this must be extended.
- //In JSF 2.0, faces-config.xml may not be necessary!
- URL url = context.getResource("/WEB-INF/faces-config.xml");
- URL urlWeb = context.getResource("/WEB-INF/web.xml");
- if (url == null && urlWeb != null)
- {
- JspApplicationContext applicationCtx = JspFactory.getDefaultFactory().getJspApplicationContext(context);
- applicationCtx.addELResolver(new WebBeansELResolver());
- }
-
- }
- catch (MalformedURLException e)
- {
- logger.error(e);
- throw new WebBeansException(e);
- }
+ JspApplicationContext applicationCtx = JspFactory.getDefaultFactory().getJspApplicationContext(context);
+ applicationCtx.addELResolver(new WebBeansELResolver());
long end = System.currentTimeMillis();