openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r757365 - /incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
Date Mon, 23 Mar 2009 10:21:07 GMT
Author: struberg
Date: Mon Mar 23 10:21:07 2009
New Revision: 757365

URL: http://svn.apache.org/viewvc?rev=757365&view=rev
Log:
OWB-85 fix propertyResolved flag - txs 2 BScheuringer

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

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java?rev=757365&r1=757364&r2=757365&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
Mon Mar 23 10:21:07 2009
@@ -63,8 +63,6 @@
         {
             if (obj == null)
             {
-                isResolution = true;
-
                 if(!ContextFactory.checkDependentContextActive())
                 {
                     ContextFactory.activateDependentContext();
@@ -73,9 +71,12 @@
 
                 String name = (String) property;
                 object = manager.getInstanceByName(name);
-
-                context.setPropertyResolved(true);
-                bean = manager.resolveByName(name).iterator().next();
+                if (object != null)
+                {
+                    isResolution = true;
+                    context.setPropertyResolved(true);
+                    bean = manager.resolveByName(name).iterator().next();
+                }
 
             }
 



Mime
View raw message