hgomez 01/07/03 09:27:19
Modified: src/share/org/apache/jasper/compiler CharDataGenerator.java
MappedCharDataGenerator.java
Log:
Fix CR/LF problems
Submitted by: in tomcat-dev, sorry I forget email address
Revision Changes Path
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CharDataGenerator.java 2000/07/25 02:21:08 1.3
+++ CharDataGenerator.java 2001/07/03 16:27:12 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CharDataGenerator.java,v
1.3 2000/07/25 02:21:08 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2000/07/25 02:21:08 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CharDataGenerator.java,v
1.4 2001/07/03 16:27:12 hgomez Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/07/03 16:27:12 $
*
* ====================================================================
*
@@ -108,7 +108,8 @@
sb.append("\\\\");
break;
case '\r':
- continue;
+ sb.append("\\r");
+ break;
/*
case '\'':
sb.append('\\');
@@ -116,7 +117,7 @@
break;
*/
case '\n':
- sb.append("\\r\\n");
+ sb.append("\\n");
break;
case '\t':
sb.append("\\t");
1.3 +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.3
diff -u -r1.2 -r1.3
--- MappedCharDataGenerator.java 2000/03/06 00:33:51 1.2
+++ MappedCharDataGenerator.java 2001/07/03 16:27:14 1.3
@@ -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.3 2001/07/03 16:27:14 hgomez Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/07/03 16:27:14 $
*
* ====================================================================
*
@@ -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();
