remm 02/01/07 10:58:54
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
- 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
1.89 +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.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- StandardContext.java 17 Nov 2001 08:34:13 -0000 1.88
+++ StandardContext.java 7 Jan 2002 18:58:54 -0000 1.89
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.88 2001/11/17 08:34:13 remm Exp $
- * $Revision: 1.88 $
- * $Date: 2001/11/17 08:34:13 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.89 2002/01/07 18:58:54 remm Exp $
+ * $Revision: 1.89 $
+ * $Date: 2002/01/07 18:58:54 $
*
* ====================================================================
*
@@ -145,7 +145,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.88 $ $Date: 2001/11/17 08:34:13 $
+ * @version $Revision: 1.89 $ $Date: 2002/01/07 18:58:54 $
*/
public class StandardContext
@@ -1037,7 +1037,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]>
