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

[Norman Richards]

  User: nrichards
  Date: 07/02/07 12:32:36

  Modified:    src/main/org/jboss/seam/core  Interpolator.java
  Log:
  interpolator shouldn't blow up on a bad message
  
  Revision  Changes    Path
  1.20      +7 -3      jboss-seam/src/main/org/jboss/seam/core/Interpolator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Interpolator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Interpolator.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- Interpolator.java	4 Feb 2007 01:13:19 -0000	1.19
  +++ Interpolator.java	7 Feb 2007 17:32:36 -0000	1.20
  @@ -135,9 +135,13 @@
                    else if (nextTok.equals("}")) 
                    {
                        if (--level == 0) {
  +                         try {
                            String value = new MessageFormat(expr.toString(), Locale.instance()).format(params);
                            builder.append(value);
  -                         
  +                         } catch (Exception e) {    
  +                             // if it is a bad message, use the expression itself
  +                             builder.append(expr);                             
  +                         }
                            expr = null;
                            break;
                        }