Author: markt
Date: Mon Nov 12 15:04:25 2018
New Revision: 1846430
URL: http://svn.apache.org/viewvc?rev=1846430&view=rev
Log:
Prevent an error when running in a Cygwin shell and the JAVA_ENDORSED_DIRS
system property is empty.
Patch provided by Zemian Deng.
Modified:
tomcat/trunk/bin/tool-wrapper.sh
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/bin/tool-wrapper.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/tool-wrapper.sh?rev=1846430&r1=1846429&r2=1846430&view=diff
==============================================================================
--- tomcat/trunk/bin/tool-wrapper.sh (original)
+++ tomcat/trunk/bin/tool-wrapper.sh Mon Nov 12 15:04:25 2018
@@ -127,7 +127,7 @@ if $cygwin; then
JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
CATALINA_HOME=`cygpath --absolute --windows "$CATALINA_HOME"`
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
- JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
+ [ -n "$JAVA_ENDORSED_DIRS" ] && JAVA_ENDORSED_DIRS=`cygpath --path --windows
"$JAVA_ENDORSED_DIRS"`
fi
# Java 9 no longer supports the java.endorsed.dirs
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1846430&r1=1846429&r2=1846430&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov 12 15:04:25 2018
@@ -131,6 +131,15 @@
</update>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ Prevent an error when running in a Cygwin shell and the
+ <code>JAVA_ENDORSED_DIRS</code> system property is empty. Patch
provided
+ by Zemian Deng. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.13 (markt)" rtext="2018-11-07">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
