remm 02/01/07 11:07:24
Modified: catalina/src/share/org/apache/catalina/core Tag:
tomcat_40_branch StandardContext.java
Log:
- Port patch.
- Synchronizing on getServletContext is unnecessary and can cause
deadlocks on shutdown.
- Should fix bug 5719, and could also fix problems with Tomcat hanging on shutdown
that couldn't be reproduced.
- Thanks to David Lecomber <dsl at ts.com> for the patch.
Revision Changes Path
No revision
No revision
1.78.2.10 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.78.2.9
retrieving revision 1.78.2.10
diff -u -r1.78.2.9 -r1.78.2.10
--- StandardContext.java 2 Dec 2001 22:24:49 -0000 1.78.2.9
+++ StandardContext.java 7 Jan 2002 19:07:24 -0000 1.78.2.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.78.2.9 2001/12/02 22:24:49 remm Exp $
- * $Revision: 1.78.2.9 $
- * $Date: 2001/12/02 22:24:49 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.78.2.10 2002/01/07 19:07:24 remm Exp $
+ * $Revision: 1.78.2.10 $
+ * $Date: 2002/01/07 19:07:24 $
*
* ====================================================================
*
@@ -142,7 +142,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.78.2.9 $ $Date: 2001/12/02 22:24:49 $
+ * @version $Revision: 1.78.2.10 $ $Date: 2002/01/07 19:07:24 $
*/
public class StandardContext
@@ -1034,7 +1034,7 @@
/**
* Return the servlet context for which this Context is a facade.
*/
- public synchronized ServletContext getServletContext() {
+ public ServletContext getServletContext() {
if (context == null)
context = new ApplicationContext(getBasePath(), this);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
