Author: markt Date: Wed Jul 14 21:24:45 2010 New Revision: 964208 URL: http://svn.apache.org/viewvc?rev=964208&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49182 Align setclasspath comments with reality. Based on a patch provided by sebb.
Modified: tomcat/trunk/bin/setclasspath.bat tomcat/trunk/bin/setclasspath.sh tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.bat?rev=964208&r1=964207&r2=964208&view=diff ============================================================================== --- tomcat/trunk/bin/setclasspath.bat (original) +++ tomcat/trunk/bin/setclasspath.bat Wed Jul 14 21:24:45 2010 @@ -15,7 +15,9 @@ rem See the License for the specific lan 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 --------------------------------------------------------------------------- Modified: tomcat/trunk/bin/setclasspath.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?rev=964208&r1=964207&r2=964208&view=diff ============================================================================== --- tomcat/trunk/bin/setclasspath.sh (original) +++ tomcat/trunk/bin/setclasspath.sh Wed Jul 14 21:24:45 2010 @@ -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$ # ----------------------------------------------------------------------------- Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=964208&r1=964207&r2=964208&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Jul 14 21:24:45 2010 @@ -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 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org