svn commit: r1650176 - /openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java

[rm...@apache.org]

Author: rmannibucau
Date: Wed Jan  7 22:10:08 2015
New Revision: 1650176

URL: http://svn.apache.org/r1650176
Log:
computing supportJavax a single time - this will surely be completely rollbacked in few days but in the meantime code is more redable

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

Modified: openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java?rev=1650176&r1=1650175&r2=1650176&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java (original)
+++ openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WebBeansELResolver.java Wed Jan  7 22:10:08 2015
@@ -57,10 +57,12 @@ public class WebBeansELResolver extends
     private static final Javax JAVAX = new Javax();
 
     private WebBeansContext webBeansContext;
+    private boolean supportJavax;
 
     public WebBeansELResolver()
     {
         webBeansContext = WebBeansContext.getInstance();
+        supportJavax = "true".equalsIgnoreCase(webBeansContext.getOpenWebBeansConfiguration().getProperty("openwebbeans.el.support-javax", "true"));
     }
     
     /**
@@ -139,8 +141,7 @@ public class WebBeansELResolver extends
                 contextualInstance = getNormalScopedContextualInstance(beanManager, elContextStore, context, bean, beanName);
             }
         }
-        if (contextualInstance == null && "javax".equals(property)
-                && "true".equalsIgnoreCase(webBeansContext.getOpenWebBeansConfiguration().getProperty("openwebbeans.el.support-javax", "true")))
+        if (contextualInstance == null && supportJavax && "javax".equals(property))
         {
             context.setPropertyResolved(true);
             return JAVAX;