Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C58C917F8D for ; Thu, 22 Jan 2015 17:55:54 +0000 (UTC) Received: (qmail 18906 invoked by uid 500); 22 Jan 2015 17:55:54 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 18883 invoked by uid 500); 22 Jan 2015 17:55:54 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 18872 invoked by uid 99); 22 Jan 2015 17:55:54 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Jan 2015 17:55:54 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id AD19BAC010E; Thu, 22 Jan 2015 17:55:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1653975 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java Date: Thu, 22 Jan 2015 17:55:54 -0000 To: derby-commits@db.apache.org From: myrnavl@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150122175554.AD19BAC010E@hades.apache.org> Author: myrnavl Date: Thu Jan 22 17:55:54 2015 New Revision: 1653975 URL: http://svn.apache.org/r1653975 Log: DERBY-4277; ReplicationRun_Local and ReplicationRun_Local_StateTest_part1 failed after testing fix of 4268 Applying the minor improvement suggested to replace 'slaveDatabasePath + FS + slaveDbSubPath + FS + replicatedDb' by 'db' in the waitForConnect() method. Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java 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=1653975&r1=1653974&r2=1653975&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 Thu Jan 22 17:55:54 2015 @@ -197,8 +197,6 @@ public class ReplicationRun_Local_StateT util.DEBUG("4. testPostStartedMasterAndSlave_StopSlave: " + connectionURL); - waitForConnect(100L, 10, - slaveDatabasePath + FS + slaveDbSubPath + FS + replicatedDb, - slaveServerHost, slaveServerPort); + waitForConnect(100L, 10, db, slaveServerHost, slaveServerPort); } }