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

[Norman Richards]

  User: nrichards
  Date: 06/12/23 21:19:14

  Modified:    src/main/org/jboss/seam/core  Interpolator.java
  Log:
  JBSEAM-624: again
  
  Revision  Changes    Path
  1.15      +16 -15    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.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- Interpolator.java	20 Dec 2006 17:01:53 -0000	1.14
  +++ Interpolator.java	24 Dec 2006 02:19:14 -0000	1.15
  @@ -49,8 +49,10 @@
       * @return the interpolated string
       */
      public String interpolate(String string, Object... params) {
  -      if ( params!=null && params.length>0 )
  -      {
  +       if (params == null) {
  +           params = new Object[0];
  +       }
  +
            if ( params.length>10 ) 
            {
               throw new IllegalArgumentException("more than 10 parameters");
  @@ -59,11 +61,10 @@
            {
               string = interpolateExpressions(string, params);
            }
  -         if ( string.indexOf('{')>=0 )
  +       if (params.length>0 &&  string.indexOf('{')>=0 )
            {
               string = new MessageFormat(string, Locale.instance()).format(params);
            }
  -      }
         return string;
      }