Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 38868 invoked from network); 18 Jan 2006 17:26:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 18 Jan 2006 17:26:06 -0000 Received: (qmail 31343 invoked by uid 500); 18 Jan 2006 17:26:06 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 31309 invoked by uid 500); 18 Jan 2006 17:26:05 -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 31291 invoked by uid 99); 18 Jan 2006 17:26:05 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jan 2006 09:26:05 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 18 Jan 2006 09:26:04 -0800 Received: (qmail 38622 invoked by uid 65534); 18 Jan 2006 17:25:44 -0000 Message-ID: <20060118172544.38518.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r370195 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/RecoveryAfterBackup.out tests/store/RecoveryAfterBackup.java Date: Wed, 18 Jan 2006 17:25:39 -0000 To: derby-commits@db.apache.org From: davidvc@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: davidvc Date: Wed Jan 18 09:25:09 2006 New Revision: 370195 URL: http://svn.apache.org/viewcvs?rev=370195&view=rev Log: Fix for DERBY-810, contributed by Oystein Grovlen Removes spurious diffs for RecoveryAfterBackup test by testing for shutdown SQL State rather than printing a stack trace. Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/RecoveryAfterBackup.out db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/RecoveryAfterBackup.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/RecoveryAfterBackup.out URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/RecoveryAfterBackup.out?rev=370195&r1=370194&r2=370195&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/RecoveryAfterBackup.out (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/RecoveryAfterBackup.out Wed Jan 18 09:25:09 2006 @@ -1,7 +1,7 @@ Count: 2 Sum: 1 Inserting records ... Shutting down database ... -SQL Exception: Derby system shutdown. +Database shutdown completed Starting restore with roll-forward recovery.. Verifying database ... Count: 256 Sum: 32640 Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/RecoveryAfterBackup.java URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/RecoveryAfterBackup.java?rev=370195&r1=370194&r2=370195&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/RecoveryAfterBackup.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/RecoveryAfterBackup.java Wed Jan 18 09:25:09 2006 @@ -83,8 +83,13 @@ try { DataSource ds = TestUtil.getDataSource(shutdownAttrs); ds.getConnection(); - } catch (Throwable ith) { - ith.printStackTrace(); + } catch(SQLException sqle) { + if (sqle.getSQLState() != null + && sqle.getSQLState().equals("XJ015")) { + System.out.println("Database shutdown completed"); + } else { + throw sqle; + } } // Start up with rollforward-recovery