Author: markt
Date: Mon Feb 17 10:34:39 2014
New Revision: 1568937
URL: http://svn.apache.org/r1568937
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56139
Avoid a web application class loader leak in some unit tests when running on
Windows.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1568936
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1568937&r1=1568936&r2=1568937&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Mon Feb 17 10:34:39 2014
@@ -44,9 +44,6 @@ test.accesslog=false
# Note the Cobertura code coverage tool is GPLv2 licensed
test.cobertura=false
-# Workaround against http://bugs.sun.com/view_bug.do?bug_id=6202721
-test.jvmarg.egd=-Djava.security.egd=file:/dev/./urandom
-
# Location of Java7 JDK
#java.7.home=/path/to/java7/jdk
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1568937&r1=1568936&r2=1568937&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Mon Feb 17 10:34:39 2014
@@ -175,6 +175,9 @@
<property name="tomcat.classes.cobertura"
value="${tomcat.classes}-cobertura"/>
<property name="cobertura.report.format" value="html"/>
+ <!-- Workaround against http://bugs.sun.com/view_bug.do?bug_id=6202721 -->
+ <available file="/dev/urandom" property="test.jvmarg.egd"
value="-Djava.security.egd=file:/dev/./urandom"/>
+ <property name="test.jvmarg.egd" value="" />
<!-- Include .gitignore in src distributions. -->
<!-- .git and .gitignore are in defaultexcludes since Ant 1.8.2 -->
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1568937&r1=1568936&r2=1568937&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Feb 17 10:34:39 2014
@@ -107,6 +107,10 @@
<bug>56137</bug>: Explicitly use the BIO connector in the SSL example
in
server.xml so it doesn't break if APR is enabled. (markt)
</fix>
+ <fix>
+ <bug>56139</bug>: Avoid a web application class loader leak in some
unit
+ tests when running on Windows. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
