Author: markt
Date: Fri Jul 1 14:15:48 2011
New Revision: 1141948
URL: http://svn.apache.org/viewvc?rev=1141948&view=rev
Log:
Fix possible NPE when serving STM servlets
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1141948&r1=1141947&r2=1141948&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Fri Jul 1
14:15:48 2011
@@ -1115,10 +1115,11 @@ public class StandardWrapper extends Con
classLoadTime=(int) (System.currentTimeMillis() -t1);
- singleThreadModel = servlet instanceof SingleThreadModel;
- if (singleThreadModel) {
- if (instancePool == null)
+ if (servlet instanceof SingleThreadModel) {
+ if (instancePool == null) {
instancePool = new Stack<Servlet>();
+ }
+ singleThreadModel = true;
}
initServlet(servlet);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1141948&r1=1141947&r2=1141948&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jul 1 14:15:48 2011
@@ -186,6 +186,10 @@
support (enhancement <bug>12428</bug>) that could trigger
authentication
even if preemptive authentication was disabled. (markt)
</fix>
+ <fix>
+ Prevent possible NPE when serving Servlets that implement the
+ SingleThreadModel interface. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
