Author: markt
Date: Mon Apr 9 16:20:57 2007
New Revision: 526952
URL: http://svn.apache.org/viewvc?view=rev&rev=526952
Log:
Fix bug 42072. Don't call destroy() if init() fails. Patch provided by Kawasima
Kazuh.
Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/servlet/JspServletWrapper.java
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=526952&r1=526951&r2=526952
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Mon Apr 9 16:20:57 2007
@@ -108,6 +108,10 @@
<bug>41227</bug> Add a bit of DEBUG-level logging to JspC so users know
which file is being compiled. (yoavs)
</fix>
+ <fix>
+ <bug>42072</bug> Don't call destroy() if the associated init() fails.
+ Patch provided by Kawasima Kazuh. (markt)
+ </fix>
</changelog>
</subsection>
</section>
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/servlet/JspServletWrapper.java?view=diff&rev=526952&r1=526951&r2=526952
==============================================================================
---
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/servlet/JspServletWrapper.java
Mon Apr 9 16:20:57 2007
@@ -137,21 +137,23 @@
// This is to maintain the original protocol.
destroy();
+ Servlet servlet = null;
try {
servletClass = ctxt.load();
- theServlet = (Servlet) servletClass.newInstance();
+ servlet = (Servlet) servletClass.newInstance();
} catch( IllegalAccessException ex1 ) {
throw new JasperException( ex1 );
} catch( InstantiationException ex ) {
throw new JasperException( ex );
}
- theServlet.init(config);
+ servlet.init(config);
if (!firstTime) {
ctxt.getRuntimeContext().incrementJspReloadCount();
}
+ theServlet = servlet;
reload = false;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
