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 ka...@apache.org on 2012/04/30 11:18:44 UTC
svn commit: r1332133 -
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/
Author: kahatlen
Date: Mon Apr 30 09:18:44 2012
New Revision: 1332133
URL: http://svn.apache.org/viewvc?rev=1332133&view=rev
Log:
DERBY-5729: Replication tests keep references to connections after completion
- close connections in tearDown()
- null out references to connections, and to other objects that are no
longer needed, in tearDown()
- remove the fields masterServer and slaveServer since they are always
null
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Distributed.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Full.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p1.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p2.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p3.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p4.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p5.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p6.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Derby4910.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_2.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_3.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part2.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_showStateChange.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java Mon Apr 30 09:18:44 2012
@@ -145,10 +145,6 @@ public class ReplicationRun extends Base
static String derbyProperties = null;
- NetworkServerControl masterServer;
-
- NetworkServerControl slaveServer;
-
String classPath = null; // Used in "localhost" testing.
/** A Connection to the master database*/
@@ -218,9 +214,26 @@ public class ReplicationRun extends Base
}
helperThreads = null;
+ close(masterConn);
+ close(slaveConn);
+
+ masterConn = null;
+ slaveConn = null;
+ startSlaveException = null;
+ classPath = null;
+ util = null;
+ state = null;
+
super.tearDown();
}
+ /** Close a connection. */
+ private static void close(Connection conn) throws SQLException {
+ if (conn != null && !conn.isClosed()) {
+ conn.close();
+ }
+ }
+
/**
* Run the test. Extra logic in addition to BaseTestCase's similar logic,
* to save derby.log and database files for replication directories if a
@@ -1285,11 +1298,6 @@ public class ReplicationRun extends Base
int xFindServerPID(String serverHost, int serverPort)
throws InterruptedException
{
- if ( masterServer != null ) // If master (and assuming then also slave)
- // is started via new NetworkServerContol() use 0 for "PID".
- {
- return 0;
- }
if ( serverHost.equalsIgnoreCase("localhost") )
{ // Assuming we do not need the PID.
return 0;
@@ -1985,7 +1993,7 @@ public class ReplicationRun extends Base
serverPort,
dbSubDirPath); // Distinguishing master/slave
}
- NetworkServerControl startServer(String serverVM, String serverVersion,
+ void startServer(String serverVM, String serverVersion,
String serverHost,
String interfacesToListenOn,
int serverPort,
@@ -2127,7 +2135,6 @@ public class ReplicationRun extends Base
util.DEBUG(debugId+"--- StartServer ");
util.DEBUG("");
- return null;
}
/*
private NetworkServerControl startServer_direct(String serverHost,
@@ -2515,13 +2522,13 @@ public class ReplicationRun extends Base
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost,
ALL_INTERFACES,
masterServerPort,
masterDbSubPath);
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost,
ALL_INTERFACES,
slaveServerPort,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Distributed.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Distributed.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Distributed.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Distributed.java Mon Apr 30 09:18:44 2012
@@ -80,13 +80,13 @@ public class ReplicationRun_Distributed
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost,
ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
masterServerPort,
masterDbSubPath); // Distinguishing master/slave
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost,
ALL_INTERFACES, // slaveServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
slaveServerPort,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Full.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Full.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Full.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Full.java Mon Apr 30 09:18:44 2012
@@ -100,7 +100,7 @@ public class ReplicationRun_Full extends
initMaster(masterServerHost,
replicatedDb); // Prototype V2: copy orig (possibly empty) db to db_master.
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost,
ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
masterServerPort,
@@ -116,7 +116,7 @@ public class ReplicationRun_Full extends
if (state.testPreStartedSlaveServer()) return; // + stop master server!
// Thread.sleep(5000L); // Just for testing....
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost,
ALL_INTERFACES, // slaveServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
slaveServerPort,
@@ -282,7 +282,7 @@ public class ReplicationRun_Full extends
if ( slavePid == -1 )
{
util.DEBUG("WARNING: slave server not available. Starting.");
- slaveServer = startServer(jvmVersion, derbyVersion,
+ startServer(jvmVersion, derbyVersion,
slaveServerHost,
ALL_INTERFACES, // slaveServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
slaveServerPort,
@@ -321,7 +321,7 @@ public class ReplicationRun_Full extends
if ( masterPid == -1 )
{
util.DEBUG("WARNING: master server not available. Starting.");
- masterServer = startServer(jvmVersion, derbyVersion,
+ startServer(jvmVersion, derbyVersion,
masterServerHost,
ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
masterServerPort,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local.java Mon Apr 30 09:18:44 2012
@@ -103,13 +103,13 @@ public class ReplicationRun_Local extend
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost,
ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
masterServerPort,
masterDbSubPath); // Distinguishing master/slave
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost,
ALL_INTERFACES, // slaveServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
slaveServerPort,
@@ -197,13 +197,13 @@ public class ReplicationRun_Local extend
initEnvironment();
initMaster(masterServerHost, replicatedDb);
- masterServer = startServer(masterJvmVersion,
+ startServer(masterJvmVersion,
derbyMasterVersion,
masterServerHost,
ALL_INTERFACES,
masterServerPort,
masterDbSubPath);
- slaveServer = startServer(slaveJvmVersion,
+ startServer(slaveJvmVersion,
derbySlaveVersion,
slaveServerHost,
ALL_INTERFACES,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1.java Mon Apr 30 09:18:44 2012
@@ -64,11 +64,11 @@ public class ReplicationRun_Local_1 exte
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost, ALL_INTERFACES, masterServerPort,
masterDbSubPath);
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost, ALL_INTERFACES, slaveServerPort,
slaveDbSubPath);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p1.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p1.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p1.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p1.java Mon Apr 30 09:18:44 2012
@@ -81,13 +81,13 @@ public class ReplicationRun_Local_3_p1 e
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost,
ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
masterServerPort,
masterDbSubPath); // Distinguishing master/slave
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost,
ALL_INTERFACES, // slaveServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
slaveServerPort,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p2.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p2.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p2.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p2.java Mon Apr 30 09:18:44 2012
@@ -86,13 +86,13 @@ public class ReplicationRun_Local_3_p2 e
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost,
ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
masterServerPort,
masterDbSubPath); // Distinguishing master/slave
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost,
ALL_INTERFACES, // slaveServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
slaveServerPort,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p3.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p3.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p3.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p3.java Mon Apr 30 09:18:44 2012
@@ -86,13 +86,13 @@ public class ReplicationRun_Local_3_p3 e
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost,
ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
masterServerPort,
masterDbSubPath); // Distinguishing master/slave
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost,
ALL_INTERFACES, // slaveServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
slaveServerPort,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p4.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p4.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p4.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p4.java Mon Apr 30 09:18:44 2012
@@ -83,13 +83,13 @@ public class ReplicationRun_Local_3_p4 e
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost,
ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
masterServerPort,
masterDbSubPath); // Distinguishing master/slave
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost,
ALL_INTERFACES, // slaveServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
slaveServerPort,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p5.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p5.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p5.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p5.java Mon Apr 30 09:18:44 2012
@@ -97,7 +97,7 @@ public class ReplicationRun_Local_3_p5 e
false); // master server dead
// Try to re-establish replication mode:
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost,
ALL_INTERFACES,
masterServerPort,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p6.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p6.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p6.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p6.java Mon Apr 30 09:18:44 2012
@@ -98,13 +98,13 @@ public class ReplicationRun_Local_3_p6 e
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost,
ALL_INTERFACES,
masterServerPort,
masterDbSubPath);
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost,
ALL_INTERFACES,
slaveServerPort,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Derby4910.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Derby4910.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Derby4910.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Derby4910.java Mon Apr 30 09:18:44 2012
@@ -67,11 +67,11 @@ public class ReplicationRun_Local_Derby4
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost, ALL_INTERFACES, masterServerPort,
masterDbSubPath);
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost, ALL_INTERFACES, slaveServerPort,
slaveDbSubPath);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1.java Mon Apr 30 09:18:44 2012
@@ -90,7 +90,7 @@ public class ReplicationRun_Local_StateT
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost,
ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
masterServerPort,
@@ -99,7 +99,7 @@ public class ReplicationRun_Local_StateT
// State test.
_testPreStartedSlaveServer();
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost,
ALL_INTERFACES, // slaveServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
slaveServerPort,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java Mon Apr 30 09:18:44 2012
@@ -79,13 +79,13 @@ public class ReplicationRun_Local_StateT
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost,
ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
masterServerPort,
masterDbSubPath); // Distinguishing master/slave
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost,
ALL_INTERFACES, // slaveServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
slaveServerPort,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_2.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_2.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_2.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_2.java Mon Apr 30 09:18:44 2012
@@ -86,14 +86,14 @@ public class ReplicationRun_Local_StateT
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost,
ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
masterServerPort,
masterDbSubPath); // Distinguishing master/slave
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost,
ALL_INTERFACES, // slaveServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
slaveServerPort,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_3.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_3.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_3.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_3.java Mon Apr 30 09:18:44 2012
@@ -78,13 +78,13 @@ public class ReplicationRun_Local_StateT
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost,
ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
masterServerPort,
masterDbSubPath); // Distinguishing master/slave
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost,
ALL_INTERFACES, // slaveServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
slaveServerPort,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part2.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part2.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part2.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part2.java Mon Apr 30 09:18:44 2012
@@ -80,13 +80,13 @@ public class ReplicationRun_Local_StateT
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost,
ALL_INTERFACES,
masterServerPort,
masterDbSubPath);
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost,
ALL_INTERFACES,
slaveServerPort,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_showStateChange.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_showStateChange.java?rev=1332133&r1=1332132&r2=1332133&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_showStateChange.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_showStateChange.java Mon Apr 30 09:18:44 2012
@@ -77,11 +77,11 @@ public class ReplicationRun_Local_showSt
initMaster(masterServerHost,
replicatedDb);
- masterServer = startServer(masterJvmVersion, derbyMasterVersion,
+ startServer(masterJvmVersion, derbyMasterVersion,
masterServerHost, ALL_INTERFACES, masterServerPort,
masterDbSubPath);
- slaveServer = startServer(slaveJvmVersion, derbySlaveVersion,
+ startServer(slaveJvmVersion, derbySlaveVersion,
slaveServerHost, ALL_INTERFACES, slaveServerPort,
slaveDbSubPath);