Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49182

Align setclasspath comments with reality.
Based on a patch provided by sebb.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@964208 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/bin/setclasspath.bat b/bin/setclasspath.bat
index c193056..a38ae72 100755 (executable)
--- a/bin/setclasspath.bat
+++ b/bin/setclasspath.bat
@@ -15,7 +15,9 @@ rem See the License for the specific language governing permissions and
 rem limitations under the License.
 
 rem ---------------------------------------------------------------------------
-rem Set CLASSPATH and Java options
+rem Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings
+rem are valid and consistent with the selected start-up options and set up the
+rem endorsed directory. 
 rem
 rem $Id$
 rem ---------------------------------------------------------------------------

diff --git a/bin/setclasspath.sh b/bin/setclasspath.sh
index abb4544..a43c935 100755 (executable)
--- a/bin/setclasspath.sh
+++ b/bin/setclasspath.sh
@@ -16,7 +16,9 @@
 # limitations under the License.
 
 # -----------------------------------------------------------------------------
-#  Set CLASSPATH and Java options
+#  Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings
+#  are valid and consistent with the selected start-up options and set up the
+#  endorsed directory. 
 #
 #  $Id$
 # -----------------------------------------------------------------------------

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 82e7194..1ea0b33 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -70,6 +70,10 @@
         one of them fails, do not ignore the others. (markt/kkolinko)
       </fix>
       <fix>
+        <bug>49182</bug>: Align comments in setclasspath.[sh|bat] with
+        behaviour. Based on a patch provided by sebb. (markt)
+      </fix>
+      <fix>
         <bug>49230</bug>: Enhance JRE leak prevention listener with protection
         for the keep-alive thread started by
         <code>sun.net.www.http.HttpClient</code>. Based on a patch provided by