You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ki...@apache.org on 2004/07/14 00:47:23 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Compiler.java PageInfo.java
kinman 2004/07/13 15:47:23
Modified: jasper2/src/share/org/apache/jasper/compiler Compiler.java
PageInfo.java
Log:
-- Fix bugzilla 29887: Recursive tag file causes infinite recursion when
checking for file dependencies.
Revision Changes Path
1.91 +2 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
Index: Compiler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- Compiler.java 7 Jul 2004 16:29:10 -0000 1.90
+++ Compiler.java 13 Jul 2004 22:47:23 -0000 1.91
@@ -154,7 +154,8 @@
// Setup page info area
pageInfo = new PageInfo(new BeanRepository(ctxt.getClassLoader(),
- errDispatcher));
+ errDispatcher),
+ ctxt.getJspFile());
JspConfig jspConfig = options.getJspConfig();
JspConfig.JspProperty jspProperty =
1.42 +9 -2 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java
Index: PageInfo.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- PageInfo.java 17 Mar 2004 19:23:03 -0000 1.41
+++ PageInfo.java 13 Jul 2004 22:47:23 -0000 1.42
@@ -37,6 +37,7 @@
private HashMap jspPrefixMapper;
private HashMap xmlPrefixMapper;
private HashMap nonCustomTagPrefixMap;
+ private String jspFile;
private String defaultLanguage = "java";
private String language;
private String defaultExtends = Constants.JSP_SERVLET_BASE;
@@ -76,7 +77,9 @@
private Vector pluginDcls; // Id's for tagplugin declarations
- PageInfo(BeanRepository beanRepository) {
+ PageInfo(BeanRepository beanRepository, String jspFile) {
+
+ this.jspFile = jspFile;
this.beanRepository = beanRepository;
this.taglibsMap = new HashMap();
this.jspPrefixMapper = new HashMap();
@@ -118,8 +121,12 @@
return imports;
}
+ public String getJspFile() {
+ return jspFile;
+ }
+
public void addDependant(String d) {
- if (!dependants.contains(d))
+ if (!dependants.contains(d) && !jspFile.equals(d))
dependants.add(d);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org