Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1A3A4990B for ; Mon, 25 Jun 2012 22:37:12 +0000 (UTC) Received: (qmail 1318 invoked by uid 500); 25 Jun 2012 22:37:12 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 1287 invoked by uid 500); 25 Jun 2012 22:37:12 -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 1277 invoked by uid 99); 25 Jun 2012 22:37:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jun 2012 22:37:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 25 Jun 2012 22:37:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BF9A92388978; Mon, 25 Jun 2012 22:36:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1353766 - in /db/derby/code/branches/10.9: ./ java/testing/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java Date: Mon, 25 Jun 2012 22:36:48 -0000 To: derby-commits@db.apache.org From: kmarsden@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120625223648.BF9A92388978@eris.apache.org> Author: kmarsden Date: Mon Jun 25 22:36:48 2012 New Revision: 1353766 URL: http://svn.apache.org/viewvc?rev=1353766&view=rev Log: DERBY-5816 ServicePropertiesFileTest fails on z/OS. Fix comment issue Modified: db/derby/code/branches/10.9/ (props changed) db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java Propchange: db/derby/code/branches/10.9/ ------------------------------------------------------------------------------ Merged /db/derby/code/trunk:r1353764 Modified: db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java?rev=1353766&r1=1353765&r2=1353766&view=diff ============================================================================== --- db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java (original) +++ db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java Mon Jun 25 22:36:48 2012 @@ -51,7 +51,8 @@ import org.apache.derbyTesting.junit.Tes public class ServicePropertiesFileTest extends BaseJDBCTestCase { - //Service Properties File is always encoded in US-ASCII + //DERBY-5816 + //Service Properties File is always encoded in ISO-8859-1 // because it is written with Properties.store private static final String SPF_ENCODING = "ISO-8859-1"; private static final String LOG_A_MODE =