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

[Gavin King]

  User: gavin   
  Date: 06/08/03 10:52:09

  Modified:    src/main/org/jboss/seam/core  Interpolator.java
  Log:
  more robust
  
  Revision  Changes    Path
  1.8       +11 -12    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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- Interpolator.java	4 Jul 2006 23:43:46 -0000	1.7
  +++ Interpolator.java	3 Aug 2006 14:52:09 -0000	1.8
  @@ -72,7 +72,7 @@
         while ( tokens.hasMoreTokens() )
         {
            String tok = tokens.nextToken();
  -         if ( "#".equals(tok) )
  +         if ( "#".equals(tok) && tokens.hasMoreTokens() )
            {
               String nextTok = tokens.nextToken();
               if ( "{".equals(nextTok) )
  @@ -95,20 +95,19 @@
                  try
                  {
                     index = Integer.parseInt( nextTok.substring(0, 1) );
  -               }
  -               catch (NumberFormatException nfe)
  -               {
  -                  builder.append(nextTok);
  -                  continue;
  -               }
                  if (index>=params.length) 
                  {
  -                  log.warn("parameter index out of bounds: " + index + " in: " + string);
  +                     //log.warn("parameter index out of bounds: " + index + " in: " + string);
  +                     builder.append("#").append(nextTok);
                  }
                  else
                  {
  -                  builder.append( params[index] );
  -                  builder.append( nextTok.substring(1) );
  +                     builder.append( params[index] ).append( nextTok.substring(1) );
  +                  }
  +               }
  +               catch (NumberFormatException nfe)
  +               {
  +                  builder.append("#").append(nextTok);
                  }
               }
            }