glenn 2002/12/27 17:46:59
Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch JspRuntimeContext.java
Log:
Fix bug 15531
Revision Changes Path
No revision
No revision
1.4.2.4 +12 -8
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
Index: JspRuntimeContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- JspRuntimeContext.java 23 Sep 2002 23:53:05 -0000 1.4.2.3
+++ JspRuntimeContext.java 28 Dec 2002 01:46:59 -0000 1.4.2.4
@@ -303,9 +303,9 @@
* registered with this class for JSP's.
*/
private void checkCompile() {
- Iterator it = jsps.values().iterator();
- while (it.hasNext()) {
- JspServletWrapper jsw = (JspServletWrapper)it.next();
+ Object [] wrappers = jsps.values().toArray();
+ for (int i = 0; i < wrappers.length; i++ ) {
+ JspServletWrapper jsw = (JspServletWrapper)wrappers[i];
JspCompilationContext ctxt = jsw.getJspEngineContext();
// JspServletWrapper also synchronizes on this when
// it detects it has to do a reload
@@ -512,7 +512,11 @@
// Check for included files which are newer than the
// JSP which uses them.
- checkCompile();
+ try {
+ checkCompile();
+ } catch (Throwable t) {
+ t.printStackTrace();
+ }
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
