cvs commit: jakarta-tomcat/src/share/org/apache/jasper Constants.java

[costin]

costin      00/12/04 15:40:48

  Modified:    src/share/org/apache/jasper Constants.java
  Log:
  Fixing another nasty bug related with JDK1.1 - MessageFormat in 1.1
  throw NPE if any argument is null ( JDK1.2+ fixes this problem ).
  
  ( this bug was found by nightly runs of watchdog with JDK1.1 )
  
  Revision  Changes    Path
  1.15      +16 -0     jakarta-tomcat/src/share/org/apache/jasper/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Constants.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Constants.java    2000/09/29 06:59:59     1.14
  +++ Constants.java    2000/12/04 23:40:46     1.15
  @@ -207,7 +207,23 @@
               String msg = resources.getString(key);
               if (args == null)
                   return msg;
  +         if( msg==null ) {
  +             //System.out.println("Can't find resource for " + key );
  +             return key;
  +         }
               MessageFormat form = new MessageFormat(msg);
  +         // JDK1.1 will throw NullPointer if args[0] == null
  +         // JDK1.2+ will work fine.
  +         
  +         //System.out.println(" XXX " + msg + " "+key + " " +args.length );
  +         if( args.length >0 ) {
  +             for( int i=0; i< args.length; i++ ) {
  +                 if( args[i]==null ) {
  +                     //System.out.println("Null argument " +msg + " " + key);
  +                     return msg;
  +                 }
  +             }
  +         }
               return form.format(args);
           } catch (MissingResourceException ignore) {
               throw new Error("Fatal Error: missing resource: 
"+ignore.getClassName());