kinman 2003/09/22 14:01:21
Modified: jasper2/src/share/org/apache/jasper/compiler
ELFunctionMapper.java Generator.java
Log:
- Fix some problem Eric reported in Smap.
TODO: remove duplications in smap.
Revision Changes Path
1.13 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ELFunctionMapper.java
Index: ELFunctionMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ELFunctionMapper.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ELFunctionMapper.java 1 May 2003 16:42:12 -0000 1.12
+++ ELFunctionMapper.java 22 Sep 2003 21:01:20 -0000 1.13
@@ -89,8 +89,8 @@
String ds = map.ds.toString();
if (ds.length() > 0) {
Node root = page.getRoot();
- new Node.Declaration(map.ss.toString(), root.getStart(), root);
- new Node.Declaration("static {\n" + ds + "}\n", root.getStart(), root);
+ new Node.Declaration(map.ss.toString(), null, root);
+ new Node.Declaration("static {\n" + ds + "}\n", null, root);
}
}
1.212 +5 -6
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- Generator.java 19 Sep 2003 23:38:08 -0000 1.211
+++ Generator.java 22 Sep 2003 21:01:21 -0000 1.212
@@ -1947,10 +1947,9 @@
}
sb.setLength(initLength);
count = JspUtil.CHUNKSIZE;
-
- // add a Smap for this line
- n.addSmap(srcLine);
}
+ // add a Smap for this line
+ n.addSmap(srcLine);
break;
case '\t' : // Not sure we need this
sb.append('\\').append('t');
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
