craigmcc 01/08/22 14:25:16
Modified: tester/src/bin tester.xml
tester/web/WEB-INF web.xml
Added: tester/src/tester/org/apache/tester Lifecycle03.java
Log:
Unit test for the fix to Bugzilla #3209 (If a servlet's service() method
throws UnavailableException, the instance should be immediately removed
from service and destroy() called). CVS:
----------------------------------------------------------------------
tracking CVS: database, then enter the PR number(s) here. CVS: Obtained
from: CVS: If this change has been taken from another system, such as
NCSA, CVS: then name the system in this line, otherwise delete it. CVS:
Submitted by: CVS: If this code has been contributed to Apache by someone
else; i.e., CVS: they sent us a patch or a new module, then include their
name/email CVS: address here. If this is your work then delete this line.
someone else has CVS: reviewed your changes, include their name(s) here.
----------------------------------------------------------------------
src/bin/tester.xml web/WEB-INF/web.xml CVS: Added Files: CVS:
src/tester/org/apache/tester/Lifecycle03.java CVS:
----------------------------------------------------------------------
Revision Changes Path
1.66 +17 -0 jakarta-tomcat-4.0/tester/src/bin/tester.xml
Index: tester.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.xml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- tester.xml 2001/08/15 23:44:23 1.65
+++ tester.xml 2001/08/22 21:25:16 1.66
@@ -570,6 +570,23 @@
request="${context.path}/WrappedLifecycle02" method="POST"
outContent="Lifecycle02 PASSED" debug="${debug}"/>
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0"
+ request="${context.path}/Lifecycle03?step=1" debug="${debug}"
+ status="503"/>
+
+<!-- NOTE - cannot do this as originally intended, because the
+ servlet was marked as permanently unavailable, so just
+ check for another 503 instead!
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0"
+ request="${context.path}/Lifecycle03?step=2"
+ outContent="Lifecycle03 PASSED" debug="${debug}"/>
+-->
+
+ <tester host="${host}" port="${port}" protocol="HTTP/1.0"
+ request="${context.path}/Lifecycle03?step=2" debug="${debug}"
+ status="503"/>
+
</target>
1.1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/Lifecycle03.java
Index: Lifecycle03.java
===================================================================
/* ========================================================================= *
* *
* The Apache Software License, Version 1.1 *
* *
* Copyright (c) 1999, 2000, 2001 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
* *
* Redistribution and use in source and binary forms, with or without modi- *
* fication, are permitted provided that the following conditions are met: *
* *
* 1. Redistributions of source code must retain the above copyright notice *
* notice, this list of conditions and the following disclaimer. *
* *
* 2. Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in the *
* documentation and/or other materials provided with the distribution. *
* *
* 3. The end-user documentation included with the redistribution, if any, *
* must include the following acknowlegement: *
* *
* "This product includes software developed by the Apache Software *
* Foundation <http://www.apache.org/>." *
* *
* Alternately, this acknowlegement may appear in the software itself, if *
* and wherever such third-party acknowlegements normally appear. *
* *
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software *
* Foundation" must not be used to endorse or promote products derived *
* from this software without prior written permission. For written *
* permission, please contact <[EMAIL PROTECTED]>. *
* *
* 5. Products derived from this software may not be called "Apache" nor may *
* "Apache" appear in their names without prior written permission of the *
* Apache Software Foundation. *
* *
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY *
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY *
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL *
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS *
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) *
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, *
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
* ========================================================================= *
* *
* This software consists of voluntary contributions made by many indivi- *
* duals on behalf of the Apache Software Foundation. For more information *
* on the Apache Software Foundation, please see <http://www.apache.org/>. *
* *
* ========================================================================= */
package org.apache.tester;
import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
import javax.servlet.*;
import javax.servlet.http.*;
/**
* Test for servlet lifecycle management. It's behavior is controlled by
* a request parameter <strong>step</strong>, which must be set to one of
* the following values:
* <ul>
* <li><em>1</em> - Throw an <code>UnavailableException</code> that indicates
* permanent unavailablility, which should cause this servlet instance
* to be destroyed and thrown away.</li>
* <li><em>2</em> - Check the lifecycle variables to ensure that the old
* instance was not reused.</li>
* </ul>
*
* @author Craig R. McClanahan
* @version $Revision: 1.1 $ $Date: 2001/08/22 21:25:16 $
*/
public class Lifecycle03 extends HttpServlet {
private static String staticTrail = "";
private String instanceTrail = "";
public void init() throws ServletException {
staticTrail += "I";
instanceTrail += "I";
}
public void destroy() {
staticTrail += "D";
instanceTrail += "D";
}
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
staticTrail += "S";
instanceTrail += "S";
// For step=1, throw an exception
if ("1".equals(request.getParameter("step"))) {
staticTrail = "IS";
throw new UnavailableException("Lifecycle03 is permanently unavailable");
}
// For step=2, evaluate the results.
response.setContentType("text/plain");
PrintWriter writer = response.getWriter();
if (staticTrail.equals("ISDIS") && instanceTrail.equals("IS"))
writer.println("Lifecycle03 PASSED");
else
writer.println("Lifecycle03 FAILED - staticTrail=" + staticTrail +
", instanceTrail=" + instanceTrail);
while (true) {
String message = StaticLogger.read();
if (message == null)
break;
writer.println(message);
}
StaticLogger.reset();
}
}
1.48 +20 -0 jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- web.xml 2001/08/20 00:33:58 1.47
+++ web.xml 2001/08/22 21:25:16 1.48
@@ -315,6 +315,11 @@
<filter-mapping>
<filter-name>HttpFilter</filter-name>
+ <url-pattern>/WrappedLifecycle03</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>HttpFilter</filter-name>
<url-pattern>/WrappedReflection01</url-pattern>
</filter-mapping>
@@ -828,6 +833,11 @@
</servlet>
<servlet>
+ <servlet-name>Lifecycle03</servlet-name>
+ <servlet-class>org.apache.tester.Lifecycle03</servlet-class>
+ </servlet>
+
+ <servlet>
<servlet-name>Reflection01</servlet-name>
<servlet-class>org.apache.tester.Reflection01</servlet-class>
</servlet>
@@ -1522,6 +1532,16 @@
<servlet-mapping>
<servlet-name>Lifecycle02</servlet-name>
<url-pattern>/WrappedLifecycle02</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Lifecycle03</servlet-name>
+ <url-pattern>/Lifecycle03</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Lifecycle03</servlet-name>
+ <url-pattern>/WrappedLifecycle03</url-pattern>
</servlet-mapping>
<servlet-mapping>
