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 E087D19F0 for ; Tue, 26 Apr 2011 20:36:54 +0000 (UTC) Received: (qmail 99159 invoked by uid 500); 26 Apr 2011 20:36:54 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 99139 invoked by uid 500); 26 Apr 2011 20:36:54 -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 99132 invoked by uid 99); 26 Apr 2011 20:36:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Apr 2011 20:36:54 +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; Tue, 26 Apr 2011 20:36:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B96B82388978; Tue, 26 Apr 2011 20:36:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1096895 - in /db/derby/code/branches/10.8: ./ java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java Date: Tue, 26 Apr 2011 20:36:33 -0000 To: derby-commits@db.apache.org From: myrnavl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110426203633.B96B82388978@eris.apache.org> Author: myrnavl Date: Tue Apr 26 20:36:33 2011 New Revision: 1096895 URL: http://svn.apache.org/viewvc?rev=1096895&view=rev Log: DERBY-4319; hang in suites.all with ibm 1.5 on AIX after ttestDefaultProperties backport undo skipping from trunk, merge command: svn merge -c 1096875 https://svn.apache.org/repos/asf/db/derby/code/trunk Modified: db/derby/code/branches/10.8/ (props changed) db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java Propchange: db/derby/code/branches/10.8/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 26 20:36:33 2011 @@ -1,2 +1,2 @@ /db/derby/code/branches/10.7:1061570,1061578,1082235 -/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741 +/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890 Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java?rev=1096895&r1=1096894&r2=1096895&view=diff ============================================================================== --- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java (original) +++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java Tue Apr 26 20:36:33 2011 @@ -82,12 +82,8 @@ public class ServerPropertiesTest exten // this fixture doesn't use a client/server setup, instead does the // relevant starting/stopping inside the test // Add security manager policy that allows executing java commands - // omit on AIX JDK 1.5 for now as it is causing a hang DERBY-4319 - // see also ttestDefaultProperties below - if (! (isPlatform(OsName.AIX) && isJava5())) { suite.addTest(decorateTest("ttestSetPortPriority", new String[] {}, new String[] {}, false)); - } // test unfinished properties settings. // decorateTest adds policy file and sets up properties @@ -107,9 +103,7 @@ public class ServerPropertiesTest exten }; // fixture hits error DRDA_MissingNetworkJar (Cannot find derbynet.jar) so, // only run with jars - // DERBY-4319 - if (TestConfiguration.loadingFromJars() && - (! (isPlatform(OsName.AIX) && isJava5()))) + if (TestConfiguration.loadingFromJars()) suite.addTest(decorateTest("ttestDefaultProperties", badServerProperties, new String[] {}, true));