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

[Peter Muir]

  User: pmuir   
  Date: 07/04/27 18:12:50

  Modified:    src/main/org/jboss/seam/core  Expressions.java
  Log:
  JBSEAM-1264
  
  Revision  Changes    Path
  1.22      +4 -4      jboss-seam/src/main/org/jboss/seam/core/Expressions.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Expressions.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Expressions.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- Expressions.java	25 Apr 2007 18:39:16 -0000	1.21
  +++ Expressions.java	27 Apr 2007 22:12:50 -0000	1.22
  @@ -1,4 +1,4 @@
  -//$Id: Expressions.java,v 1.21 2007/04/25 18:39:16 pmuir Exp $
  +//$Id: Expressions.java,v 1.22 2007/04/27 22:12:50 pmuir Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -169,9 +169,9 @@
            
            private javax.faces.el.MethodBinding getFacesMethodBinding(Class[] types, Object... args)
            {
  -            if (cachedMethodBinding==null)
  -            {
                  FacesContext context = FacesContext.getCurrentInstance();
  +            if (cachedMethodBinding==null || (context == null && !(cachedMethodBinding instanceof UnifiedELMethodBinding)))
  +            {     
                  cachedMethodBinding = context==null ? 
                        new UnifiedELMethodBinding(expression, types) : 
                        context.getApplication().createMethodBinding(expression, types);