From derby-commits-return-11512-apmail-db-derby-commits-archive=db.apache.org@db.apache.org Wed May 06 16:04:08 2009 Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 12212 invoked from network); 6 May 2009 16:04:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 May 2009 16:04:07 -0000 Received: (qmail 36958 invoked by uid 500); 6 May 2009 16:04:07 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 36932 invoked by uid 500); 6 May 2009 16:04:07 -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 36923 invoked by uid 99); 6 May 2009 16:04:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 May 2009 16:04:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 May 2009 16:04:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CB023238896C; Wed, 6 May 2009 16:03:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: derby-commits@db.apache.org From: dag@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090506160344.CB023238896C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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