cvs commit: jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator CharDataGenerator.java MappedCharDataGenerator.java

[larryi]

larryi      01/07/10 13:41:53

  Modified:    jasper34/generator/org/apache/jasper34/generator
                        CharDataGenerator.java MappedCharDataGenerator.java
  Log:
  Fix problem with JSP files which use just CR as line terminator. During
  translation CR's would be stripped instead of kept as is or replaced with
  CRLF.  With this patch, line termination is preserved.
  
  Submitted by: Si Ly
  
  Revision  Changes    Path
  1.5       +6 -5      
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CharDataGenerator.java
  
  Index: CharDataGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CharDataGenerator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CharDataGenerator.java    2001/06/13 01:11:35     1.4
  +++ CharDataGenerator.java    2001/07/10 20:41:49     1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CharDataGenerator.java,v
 1.4 2001/06/13 01:11:35 costin Exp $
  - * $Revision: 1.4 $
  - * $Date: 2001/06/13 01:11:35 $
  + * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CharDataGenerator.java,v
 1.5 2001/07/10 20:41:49 larryi Exp $
  + * $Revision: 1.5 $
  + * $Date: 2001/07/10 20:41:49 $
    *
    * ====================================================================
    * 
  @@ -109,7 +109,8 @@
                sb.append("\\\\");
                break;
            case '\r':
  -             continue;
  +             sb.append("\\r");
  +             break;
                /*
                  case '\'':
                  sb.append('\\');
  @@ -117,7 +118,7 @@
                  break;
                */
            case '\n':
  -             sb.append("\\r\\n");
  +             sb.append("\\n");
                break;
            case '\t':
                sb.append("\\t");
  
  
  
  1.3       +6 -5      
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/MappedCharDataGenerator.java
  
  Index: MappedCharDataGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/MappedCharDataGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MappedCharDataGenerator.java      2001/06/06 06:17:47     1.2
  +++ MappedCharDataGenerator.java      2001/07/10 20:41:50     1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/MappedCharDataGenerator.java,v
 1.2 2001/06/06 06:17:47 costin Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/06/06 06:17:47 $
  + * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/MappedCharDataGenerator.java,v
 1.3 2001/07/10 20:41:50 larryi Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/07/10 20:41:50 $
    *
    * ====================================================================
    * 
  @@ -95,7 +95,8 @@
                sb.append("\\\\");
                break;
            case '\r':
  -             continue;
  +             sb.append("\\r");
  +             break;
                /*
                  case '\'':
                  sb.append('\\');
  @@ -103,7 +104,7 @@
                  break;
                */
            case '\n':
  -             sb.append("\\r\\n");
  +             sb.append("\\n");
                writer.print(sb.toString());
                writer.print("\");\n");
                sb = new StringBuffer();