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

[Peter Muir]

  User: pmuir   
  Date: 07/07/03 08:40:35

  Modified:    src/main/org/jboss/seam/jsf  UnifiedELMethodBinding.java
  Log:
  Fix NPE from JSP
  
  Revision  Changes    Path
  1.3       +2 -1      jboss-seam/src/main/org/jboss/seam/jsf/UnifiedELMethodBinding.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UnifiedELMethodBinding.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/UnifiedELMethodBinding.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UnifiedELMethodBinding.java	21 Jun 2007 05:27:29 -0000	1.2
  +++ UnifiedELMethodBinding.java	3 Jul 2007 12:40:35 -0000	1.3
  @@ -60,8 +60,9 @@
      {
         if (methodExpression==null)
         {
  +         // In JSF 1.1 EL (argTypes = null) == (argTypes = new Class[0]), but not in Unified EL
            methodExpression = ctx.getApplication().getExpressionFactory()
  -                  .createMethodExpression( ctx.getELContext(), expressionString, Object.class, argTypes );
  +                  .createMethodExpression( ctx.getELContext(), expressionString, Object.class, argTypes == null ? new Class[0] : argTypes );
         }
         return methodExpression;
      }