tomcat升级为7.0.85
diff --git a/tomcat-7/bin/setclasspath.sh b/tomcat-7/bin/setclasspath.sh
index 873fad3..5232b8e 100755
--- a/tomcat-7/bin/setclasspath.sh
+++ b/tomcat-7/bin/setclasspath.sh
@@ -79,8 +79,12 @@
# Don't override the endorsed dir if the user has set it previously
if [ -z "$JAVA_ENDORSED_DIRS" ]; then
- # Set the default -Djava.endorsed.dirs argument
- JAVA_ENDORSED_DIRS="$CATALINA_HOME"/endorsed
+ # Java 9 no longer supports the java.endorsed.dirs
+ # system property. Only try to use it if
+ # CATALINA_HOME/endorsed exists.
+ if [ -d "$CATALINA_HOME"/endorsed ]; then
+ JAVA_ENDORSED_DIRS="$CATALINA_HOME"/endorsed
+ fi
fi
# Set standard commands for invoking Java, if not already set.
@@ -91,4 +95,4 @@
if [ -z "$_RUNJDB" ]; then
_RUNJDB="$JAVA_HOME"/bin/jdb
fi
-fi
\ No newline at end of file
+fi