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

[Peter Muir]

  User: pmuir   
  Date: 07/11/29 09:45:09

  Modified:    src/main/org/jboss/seam/bpm  SeamExpressionEvaluator.java
  Log:
  Slightly better
  
  Revision  Changes    Path
  1.7       +7 -2      jboss-seam/src/main/org/jboss/seam/bpm/SeamExpressionEvaluator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamExpressionEvaluator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/bpm/SeamExpressionEvaluator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- SeamExpressionEvaluator.java	28 Nov 2007 18:03:56 -0000	1.6
  +++ SeamExpressionEvaluator.java	29 Nov 2007 14:45:09 -0000	1.7
  @@ -119,7 +119,11 @@
                       exceptions.add(e);
                   }
                   
  -                if (exceptions.size() > 0)
  +                if (exceptions.size() == 1)
  +                {
  +                   throw new ELException("Error evaluating " + expression, exceptions.get(0));
  +                }
  +                else if (exceptions.size() > 1)
                   {
                      log.debug("Exceptions occurred when parsing " + expression);
                      for (javax.el.ELException e : exceptions)
  @@ -127,9 +131,10 @@
                         log.debug("Possible cause", e);
                      }
                   }
  -                else if (me == null && ve ==  null)
  +                if (me == null && ve ==  null)
                   {
                      log.debug("Error parsing " + expression);
  +                   throw new ELException("Error parsing " + expression + "; not a valid EL expression");
                   }
                   throw new ELException("Error evaluating " + expression + "; possible causes are logged at debug level");
               }