Author: markt Date: Fri Apr 27 12:32:28 2018 New Revision: 1830341 URL: http://svn.apache.org/viewvc?rev=1830341&view=rev Log: Avoid warning when running under Cygwin when the JAVA_ENDORSED_DIRS environment variable is not set. Patch provided by Zemian Deng. This closes #106
Modified: tomcat/trunk/bin/catalina.sh tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1830341&r1=1830340&r2=1830341&view=diff ============================================================================== --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Fri Apr 27 12:32:28 2018 @@ -240,7 +240,7 @@ if $cygwin; then CATALINA_BASE=`cygpath --absolute --windows "$CATALINA_BASE"` CATALINA_TMPDIR=`cygpath --absolute --windows "$CATALINA_TMPDIR"` 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 if [ -z "$JSSE_OPTS" ] ; then Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1830341&r1=1830340&r2=1830341&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Fri Apr 27 12:32:28 2018 @@ -142,6 +142,15 @@ </fix> </changelog> </subsection> + <subsection name="Other"> + <changelog> + <fix> + Avoid warning when running under Cygwin when the + <code>JAVA_ENDORSED_DIRS</code> environment variable is not set. Patch + provided by Zemian Deng. (markt) + </fix> + </changelog> + </subsection> </section> <section name="Tomcat 9.0.7 (markt)" rtext="2018-04-07"> <subsection name="Catalina"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org