larryi 01/07/10 13:43:38
Modified: src/share/org/apache/jasper/compiler Tag: tomcat_32
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
No revision
No revision
1.2.4.1 +6 -5
jakarta-tomcat/src/share/org/apache/jasper/compiler/CharDataGenerator.java
Index: CharDataGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CharDataGenerator.java,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- CharDataGenerator.java 2000/04/05 02:55:12 1.2
+++ CharDataGenerator.java 2001/07/10 20:43:33 1.2.4.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CharDataGenerator.java,v
1.2 2000/04/05 02:55:12 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2000/04/05 02:55:12 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CharDataGenerator.java,v
1.2.4.1 2001/07/10 20:43:33 larryi Exp $
+ * $Revision: 1.2.4.1 $
+ * $Date: 2001/07/10 20:43:33 $
*
* ====================================================================
*
@@ -107,7 +107,8 @@
sb.append("\\\\");
break;
case '\r':
- continue;
+ sb.append("\\r");
+ break;
/*
case '\'':
sb.append('\\');
@@ -115,7 +116,7 @@
break;
*/
case '\n':
- sb.append("\\r\\n");
+ sb.append("\\n");
break;
case '\t':
sb.append("\\t");
1.2.4.1 +6 -5
jakarta-tomcat/src/share/org/apache/jasper/compiler/MappedCharDataGenerator.java
Index: MappedCharDataGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/MappedCharDataGenerator.java,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- MappedCharDataGenerator.java 2000/03/06 00:33:51 1.2
+++ MappedCharDataGenerator.java 2001/07/10 20:43:34 1.2.4.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/MappedCharDataGenerator.java,v
1.2 2000/03/06 00:33:51 mandar Exp $
- * $Revision: 1.2 $
- * $Date: 2000/03/06 00:33:51 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/MappedCharDataGenerator.java,v
1.2.4.1 2001/07/10 20:43:34 larryi Exp $
+ * $Revision: 1.2.4.1 $
+ * $Date: 2001/07/10 20:43:34 $
*
* ====================================================================
*
@@ -93,7 +93,8 @@
sb.append("\\\\");
break;
case '\r':
- continue;
+ sb.append("\\r");
+ break;
/*
case '\'':
sb.append('\\');
@@ -101,7 +102,7 @@
break;
*/
case '\n':
- sb.append("\\r\\n");
+ sb.append("\\n");
writer.print(sb.toString());
writer.print("\");\n");
sb = new StringBuffer();
