db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r772337 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java
Date Wed, 06 May 2009 16:03:44 GMT
Author: dag
Date: Wed May  6 16:03:44 2009
New Revision: 772337

URL: http://svn.apache.org/viewvc?rev=772337&view=rev
Log:
DERBY-4186 After master stop, test fails when it succeeds in connecting (rebooting) shut-down
ex-slave

Patch derby-4186-followup, to further simplify the already committed
patch, as suggested by Jorgen Loland.


Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java?rev=772337&r1=772336&r2=772337&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/db/SlaveDatabase.java Wed May  6
16:03:44 2009
@@ -352,10 +352,7 @@
             }
         }
 
-        if (bootException != null &&
-            SQLState.SHUTDOWN_DATABASE.startsWith(
-                bootException.getSQLState()) &&
-            bootException.getSeverity() == ExceptionSeverity.DATABASE_SEVERITY) {
+        if (bootException != null) {
 
             // DERBY-4186: This is a corner case. Master made us shut down
             // before the initial connect which establishes the slave has



Mime
View raw message