svn commit: r1074498 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java

[struberg]

Author: struberg
Date: Fri Feb 25 12:29:36 2011
New Revision: 1074498

URL: http://svn.apache.org/viewvc?rev=1074498&view=rev
Log:
OWB-514 use BeanManagerImpl#isInUse() instead of sucking in all the plugins...

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java?rev=1074498&r1=1074497&r2=1074498&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
 Fri Feb 25 12:29:36 2011
@@ -33,7 +33,6 @@ import javax.enterprise.inject.spi.Bean;
 
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.container.BeanManagerImpl;
-import org.apache.webbeans.spi.plugins.AbstractOwbJsfPlugin;
 
 /**
  * JSF or JSP expression language a.k.a EL resolver.
@@ -96,33 +95,12 @@ public class WebBeansELResolver extends 
     @SuppressWarnings({"unchecked","deprecation"})
     public Object getValue(ELContext context, Object obj, Object property) 
throws NullPointerException, PropertyNotFoundException, ELException
     {
-        //Check that application is OWB enabled
-        //For JSF applications that are not
-        //OWB enabled, no need to go with this resolver....
-        WebBeansContext webBeansContext = this.webBeansContext;
-        
-        AbstractOwbJsfPlugin jsfPlugin = 
webBeansContext.getPluginLoader().getJsfPlugin();
-        
-        //No JSF plugin, sure that not OWB  
-        if(jsfPlugin == null && 
!(webBeansContext.getOpenWebBeansConfiguration().isJspApplication()))
-        {
-            return null;
-        }        
-
-        //If PluginLoader is called by application explicitly
-        //But not OWB application
-        else if(jsfPlugin != null)
-        {
-            if(!jsfPlugin.isOwbApplication())
-            {
-                return null;
-            }
-        }
-        else
+        // Check if the OWB actually got used in this application
+        if (!webBeansContext.getBeanManagerImpl().isInUse())
         {
             return null;
         }
-        
+
         //Bean instance
         Object contextualInstance = null;
         ELContextStore elContextStore = null;