You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by da...@apache.org on 2014/08/20 18:55:31 UTC
svn commit: r1619157 - in /db/derby/code/branches/10.11: ./
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
Author: dag
Date: Wed Aug 20 16:55:31 2014
New Revision: 1619157
URL: http://svn.apache.org/r1619157
Log:
DERBY-6619 After silently swallowing SecurityExceptions, Derby can leak class loaders
Backported from trunk svn 1619154.
Fix to make a path to derby.log OS agnostic; used to fail on Windows.
Modified:
db/derby/code/branches/10.11/ (props changed)
db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
Propchange: db/derby/code/branches/10.11/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1619154
Modified: db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java?rev=1619157&r1=1619156&r2=1619157&view=diff
==============================================================================
--- db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java (original)
+++ db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java Wed Aug 20 16:55:31 2014
@@ -509,8 +509,7 @@ public class SecureServerTest extends Ba
private void assertWarningDerby6619() throws IOException {
final String logFileName =
- getSystemProperty("derby.system.home").replace("/system","") +
- File.separator + "/derby.log";
+ getSystemProperty("user.dir") + File.separator + "derby.log";
if (!DerbyNetAutoStartTest.checkLog(logFileName, expected6619)) {
fail("Expected warning on derby.log cf DERBY-6619");
}