Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 96594 invoked from network); 8 Dec 2006 17:52:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Dec 2006 17:52:39 -0000 Received: (qmail 59452 invoked by uid 500); 8 Dec 2006 17:52:47 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 59421 invoked by uid 500); 8 Dec 2006 17:52:47 -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 59410 invoked by uid 99); 8 Dec 2006 17:52:47 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Dec 2006 09:52:47 -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 [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Dec 2006 09:52:38 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 10F4F1A9846; Fri, 8 Dec 2006 09:51:56 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r484672 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java Date: Fri, 08 Dec 2006 17:51:55 -0000 To: derby-commits@db.apache.org From: djd@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061208175156.10F4F1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djd Date: Fri Dec 8 09:51:55 2006 New Revision: 484672 URL: http://svn.apache.org/viewvc?view=rev&rev=484672 Log: DERBY-2083 Fix broken backup/restore tests. Caused by not updating path through code when a service is directly accessed as a file rather than through the StorageFactory api. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java?view=diff&rev=484672&r1=484671&r2=484672 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java Fri Dec 8 09:51:55 2006 @@ -263,7 +263,12 @@ if( recreateFrom != null) // restore from a file { File propFile = new File(recreateFrom, PersistentService.PROPERTIES_NAME); - return new FileInputStream(propFile); + InputStream is = new FileInputStream(propFile); + try { + serviceProperties.load(new BufferedInputStream(is)); + } finally { + is.close(); + } } else { @@ -281,8 +286,8 @@ } finally { storageFactory.shutdown(); } - return null; } + return null; } } );