[jboss-cvs] jboss-seam/src/main/org/jboss/seam/el ...

[Gavin King]

  User: gavin   
  Date: 07/06/25 01:51:03

  Modified:    src/main/org/jboss/seam/el  SeamELResolver.java
  Log:
  support conversationContext['entityManager'], etc
  
  Revision  Changes    Path
  1.3       +14 -0     jboss-seam/src/main/org/jboss/seam/el/SeamELResolver.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamELResolver.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/el/SeamELResolver.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- SeamELResolver.java	19 Jun 2007 19:02:32 -0000	1.2
  +++ SeamELResolver.java	25 Jun 2007 05:51:03 -0000	1.3
  @@ -11,6 +11,7 @@
   import javax.el.ELResolver;
   
   import org.jboss.seam.Component;
  +import org.jboss.seam.contexts.Context;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.Init;
   
  @@ -123,6 +124,19 @@
               return null;
            }
         }
  +      else if (base instanceof Context)
  +      {
  +         Context seamContext = (Context) base;
  +         if ( seamContext.isSet( (String) property ) )
  +         {
  +            context.setPropertyResolved(true);
  +            return seamContext.get( (String) property );
  +         }
  +         else
  +         {
  +            return null;
  +         }
  +      }
         else
         {
            return null;