cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler Compiler.java IncludeGenerator.java XmlOutputter.java

[pierred]

pierred     00/12/15 04:29:26

  Modified:    jasper/src/share/org/apache/jasper/compiler Compiler.java
                        IncludeGenerator.java XmlOutputter.java
  Log:
  Bug fix: check for null value before processing the Hashtable.
  
  Revision  Changes    Path
  1.4       +6 -4      
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java
  
  Index: Compiler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Compiler.java     2000/10/11 19:35:11     1.3
  +++ Compiler.java     2000/12/15 12:29:24     1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
 1.3 2000/10/11 19:35:11 shemnon Exp $
  - * $Revision: 1.3 $
  - * $Date: 2000/10/11 19:35:11 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
 1.4 2000/12/15 12:29:24 pierred Exp $
  + * $Revision: 1.4 $
  + * $Date: 2000/12/15 12:29:24 $
    *
    * ====================================================================
    * 
  @@ -138,7 +138,9 @@
                             Logger.DEBUG);
   
           // Setup the ServletWriter
  -        String javaEncoding = "UTF8";           // perhaps debatable?
  +        //String javaEncoding = "BADENC77";           // perhaps debatable?
  +     String javaEncoding = "UTF8";           // perhaps debatable?
  +     System.out.println("SERVLET ENCODING IS: " + javaEncoding);
           ServletWriter writer = 
               (new ServletWriter
                   (new PrintWriter
  
  
  
  1.7       +4 -4      
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java
  
  Index: IncludeGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- IncludeGenerator.java     2000/11/30 21:47:53     1.6
  +++ IncludeGenerator.java     2000/12/15 12:29:24     1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
 1.6 2000/11/30 21:47:53 pierred Exp $
  - * $Revision: 1.6 $
  - * $Date: 2000/11/30 21:47:53 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
 1.7 2000/12/15 12:29:24 pierred Exp $
  + * $Revision: 1.7 $
  + * $Date: 2000/12/15 12:29:24 $
    *
    * ====================================================================
    * 
  @@ -153,7 +153,7 @@
                        writer.println("_jspx_qStr = _jspx_qStr + \"" + sep +
                                       key + "=\" + \"" + value[0] + "\";");
                    } else {
  -                     writer.println("String [] _tmpS = new String[" + value.length 
+"];");
  +                     //@@@No need for this@@@ writer.println("String [] _tmpS = new 
String[" + value.length +"];");
                        for (int i = 0; i < value.length; i++) {
                            if (!JspUtil.isExpression(value[i], isXml))
                                writer.println("_jspx_qStr = _jspx_qStr + \"" + sep +
  
  
  
  1.7       +4 -3      
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java
  
  Index: XmlOutputter.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XmlOutputter.java 2000/12/09 00:36:10     1.6
  +++ XmlOutputter.java 2000/12/15 12:29:25     1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
 1.6 2000/12/09 00:36:10 pierred Exp $
  - * $Revision: 1.6 $
  - * $Date: 2000/12/09 00:36:10 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/XmlOutputter.java,v
 1.7 2000/12/15 12:29:25 pierred Exp $
  + * $Revision: 1.7 $
  + * $Date: 2000/12/15 12:29:25 $
    *
    * ====================================================================
    *
  @@ -160,6 +160,7 @@
        * (name, value) to the XML stream.
        */
       void append(String tag, Hashtable table) {
  +     if (table == null) return;
        Enumeration enum = table.keys();
        while (enum.hasMoreElements()) {
            String name = (String)enum.nextElement();