Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 44502 invoked from network); 7 Dec 2007 20:24:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Dec 2007 20:24:29 -0000 Received: (qmail 84402 invoked by uid 500); 7 Dec 2007 20:24:18 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 84330 invoked by uid 500); 7 Dec 2007 20:24:18 -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 84313 invoked by uid 99); 7 Dec 2007 20:24:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Dec 2007 12:24:18 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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, 07 Dec 2007 20:24:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4232D1A9832; Fri, 7 Dec 2007 12:24:09 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r602206 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java Date: Fri, 07 Dec 2007 20:24:08 -0000 To: derby-commits@db.apache.org From: djd@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071207202409.4232D1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djd Date: Fri Dec 7 12:24:08 2007 New Revision: 602206 URL: http://svn.apache.org/viewvc?rev=602206&view=rev Log: Cleanup NetworkServerTestSetup to use utility methods when setting and reading system properties which will ensure the code works with a security manager. Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java?rev=602206&r1=602205&r2=602206&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java Fri Dec 7 12:24:08 2007 @@ -330,16 +330,17 @@ // This is a hack. A NetworkServerControl constructor with // the needed interface to control sslMode (and possibly // more) would be better. - String oldValue = - System.setProperty("derby.drda.sslMode", config.getSsl()); + String oldValue = BaseTestCase.getSystemProperty("derby.drda.sslMode"); + BaseTestCase.setSystemProperty("derby.drda.sslMode", config.getSsl()); NetworkServerControl control = new NetworkServerControl (InetAddress.getByName(config.getHostName()), config.getPort()); + if (oldValue == null) { - // JDK 1.4 does not have clearProperty.... - System.getProperties().remove("derby.drda.sslMode"); + + BaseTestCase.removeSystemProperty("derby.drda.sslMode"); } else { - System.setProperty("derby.drda.sslMode", oldValue); + BaseTestCase.setSystemProperty("derby.drda.sslMode", oldValue); } return control; }