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 2010/07/27 21:45:02 UTC

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

Author: struberg
Date: Tue Jul 27 19:45:02 2010
New Revision: 979827

URL: http://svn.apache.org/viewvc?rev=979827&view=rev
Log:
OWB-425 return the cached Object and not the ContextualStore

txs 2 Eric and Rohit for catching it!

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

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java?rev=979827&r1=979826&r2=979827&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java Tue Jul 27 19:45:02 2010
@@ -97,7 +97,13 @@ public class ELContextStore
         {
             return null;
         }
-        return dependentObjects.get(dependentBean);
+        CreationalStore cs =  dependentObjects.get(dependentBean);
+        if (cs != null)
+        {
+            return cs.getObject();
+        }
+        
+        return null;
     }
 
     private static class CreationalStore