Author: markt
Date: Fri Nov 27 19:38:09 2009
New Revision: 884976
URL: http://svn.apache.org/viewvc?rev=884976&view=rev
Log:
Refix https://issues.apache.org/bugzilla/show_bug.cgi?id=37848
Don't output info messages when there is no terminal
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=884976&r1=884975&r2=884976&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Nov 27 19:38:09 2009
@@ -111,12 +111,6 @@
+1: rjung, markt, mturk
-1:
-* Refix https://issues.apache.org/bugzilla/show_bug.cgi?id=37848
- Don't output info messages when there is no terminal
- http://svn.apache.org/viewvc?rev=828225&view=rev
- +1: markt, kkolinko, mturk
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48097
There are two patches to be applied:
1) Make WebappClassLoader to do not swallow AccessControlException
Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh?rev=884976&r1=884975&r2=884976&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.sh Fri Nov 27
19:38:09 2009
@@ -209,7 +209,9 @@
else
shift
if [ "$1" = "-security" ] ; then
- echo "Using Security Manager"
+ if [ $have_tty -eq 1 ]; then
+ echo "Using Security Manager"
+ fi
shift
exec "$_RUNJDB" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
@@ -235,7 +237,9 @@
shift
if [ "$1" = "-security" ] ; then
- echo "Using Security Manager"
+ if [ $have_tty -eq 1 ]; then
+ echo "Using Security Manager"
+ fi
shift
exec "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
@@ -259,7 +263,9 @@
shift
touch "$CATALINA_BASE"/logs/catalina.out
if [ "$1" = "-security" ] ; then
- echo "Using Security Manager"
+ if [ $have_tty -eq 1 ]; then
+ echo "Using Security Manager"
+ fi
shift
"$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=884976&r1=884975&r2=884976&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Nov 27
19:38:09 2009
@@ -63,6 +63,10 @@
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>37848</bug>: Re-fix. Don't display info output when there is no
+ terminal. (markt)
+ </fix>
+ <fix>
<bug>41059</bug>: Reduce the chances of errors when using
ENABLE_CLEAR_REFERENCES. Patch by Curt Arnold. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
