From c78a5ad8da432513b80b8c9b9d8437ffa6b63837 Mon Sep 17 00:00:00 2001 From: rjung Date: Mon, 21 Dec 2009 15:02:07 +0000 Subject: [PATCH] Fix some comment typos. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@892843 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/core/StandardContext.java | 2 +- java/org/apache/catalina/loader/WebappClassLoader.java | 10 +++++----- webapps/docs/config/context.xml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 62ab27d6f..67d0916e4 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -748,7 +748,7 @@ public class StandardContext private boolean clearReferencesStatic = false; /** - * Should Tomcat attempt to termiate threads that have been started by the + * Should Tomcat attempt to terminate threads that have been started by the * web application? Stopping threads is performed via the deprecated (for * good reason) Thread.stop() method and is likely to result in * instability. As such, enabling this should be viewed as an option of last diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java index a50a13e9b..3e52686fb 100644 --- a/java/org/apache/catalina/loader/WebappClassLoader.java +++ b/java/org/apache/catalina/loader/WebappClassLoader.java @@ -415,7 +415,7 @@ public class WebappClassLoader /** * Should Tomcat attempt to null out any static or final fields from loaded * classes when a web application is stopped as a work around for apparent - * garbage collection bugs and application coding errors. There have been + * garbage collection bugs and application coding errors? There have been * some issues reported with log4j when this option is true. Applications * without memory leaks using recent JVMs should operate correctly with this * option set to false. If not specified, the default value of @@ -424,9 +424,9 @@ public class WebappClassLoader private boolean clearReferencesStatic = false; /** - * Should Tomcat attempt to termiate threads that have been started by the + * Should Tomcat attempt to terminate threads that have been started by the * web application? Stopping threads is performed via the deprecated (for - * goo reason) Thread.stop() method and is likely to result in + * good reason) Thread.stop() method and is likely to result in * instability. As such, enabling this should be viewed as an option of last * resort in a development environment and is not recommended in a * production environment. If not specified, the default value of @@ -2007,9 +2007,9 @@ public class WebappClassLoader } // This method is deprecated and for good reason. This is - // very risky code but is only only option at this point + // very risky code but is the only option at this point. // A *very* good reason for apps to do this clean-up - // themselves + // themselves. thread.stop(); } } diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 579cc4956..6d5e852f5 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -340,12 +340,12 @@ -

If true, Tomcat attempts to termiate threads that have - been started by the web application? Stopping threads is performed via +

If true, Tomcat attempts to terminate threads that have + been started by the web application. Stopping threads is performed via the deprecated (for good reason) Thread.stop() method and is likely to result in instability. As such, enabling this should be viewed as an option of last resort in a development environment and is - not recommended in a production environment.If not specified, the + not recommended in a production environment. If not specified, the default value of false will be used.

 -- 2.11.0