billbarker 2003/02/19 22:16:38
Modified: jasper2/src/share/org/apache/jasper/compiler
TagFileProcessor.java
Log:
Restore the syncing of the tripCount, at least when running from JspServlet.
Revision Changes Path
1.42 +6 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java
Index: TagFileProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagFileProcessor.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- TagFileProcessor.java 19 Feb 2003 07:39:49 -0000 1.41
+++ TagFileProcessor.java 20 Feb 2003 06:16:38 -0000 1.42
@@ -413,6 +413,7 @@
JspCompilationContext ctxt = compiler.getCompilationContext();
JspRuntimeContext rctxt = ctxt.getRuntimeContext();
JspServletWrapper wrapper = null;
+ int tripCount;
if( rctxt != null ) {
wrapper =
(JspServletWrapper) rctxt.getWrapper(tagFilePath);
@@ -427,6 +428,8 @@
(JarFile)
ctxt.getTagFileJars().get(tagFilePath));
rctxt.addWrapper(tagFilePath,wrapper);
}
+ tripCount = wrapper.incTripCount();
+
}
} else {
wrapper = new JspServletWrapper(ctxt.getServletContext(),
@@ -436,11 +439,11 @@
ctxt.getRuntimeContext(),
(JarFile)ctxt.getTagFileJars().get(tagFilePath)
);
+ tripCount = wrapper.incTripCount();
}
Class tagClazz;
- int tripCount = wrapper.incTripCount();
try {
if (tripCount > 0) {
// When tripCount is greater than zero, a circular
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
