db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r956445 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store: BootLockMinion.java BootLockTest.java
Date Mon, 21 Jun 2010 06:46:45 GMT
Author: kmarsden
Date: Mon Jun 21 02:34:29 2010
New Revision: 956445

URL: http://svn.apache.org/viewvc?rev=956445&view=rev
Log:
DERBY-4776 BootLock test failure.

Fix problem with check in.  For some reason checked in file was still checking for port argument.


Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockMinion.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockMinion.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockMinion.java?rev=956445&r1=956444&r2=956445&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockMinion.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockMinion.java
Mon Jun 21 02:34:29 2010
@@ -39,7 +39,6 @@ import org.apache.derby.jdbc.EmbeddedSim
 public class BootLockMinion {
     public static void main(String[] args) {
         String dbName = args[0];
-        int portNumber = Integer.decode(args[1]).intValue();
         Connection con;
         Statement stmt;
         System.setProperty("derby.stream.error.file",

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java?rev=956445&r1=956444&r2=956445&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java
Mon Jun 21 02:34:29 2010
@@ -182,7 +182,8 @@ public class BootLockTest extends BaseJD
         do {
             if (lockFile.exists()) {
                 // if the lock file is there the database has booted, return
-                return;
+                Thread.sleep(10000); 
+               return;
             }
             // otherwise sleep for a second and try again
             waitmillis -= 1000;



Mime
View raw message