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 2E555C63D for ; Fri, 27 Apr 2012 07:20:02 +0000 (UTC) Received: (qmail 96103 invoked by uid 500); 27 Apr 2012 07:20:02 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 95977 invoked by uid 500); 27 Apr 2012 07:19:58 -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 95949 invoked by uid 99); 27 Apr 2012 07:19:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Apr 2012 07:19:57 +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; Fri, 27 Apr 2012 07:19:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 72FB0238897D; Fri, 27 Apr 2012 07:19:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1331262 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java Date: Fri, 27 Apr 2012 07:19:36 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120427071936.72FB0238897D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kahatlen Date: Fri Apr 27 07:19:36 2012 New Revision: 1331262 URL: http://svn.apache.org/viewvc?rev=1331262&view=rev Log: DERBY-5722: InternationalConnectTest forgets to call super.tearDown() - Call super.tearDown() from tearDown() - Close XAConnections and PooledConnections - Clear reference to ArrayList in tearDown() to allow it to be gc'ed Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java?rev=1331262&r1=1331261&r2=1331262&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java Fri Apr 27 07:19:36 2012 @@ -188,18 +188,21 @@ public class InternationalConnectTest ex XAConnection xaconn = ds.getXAConnection(); Connection conn = xaconn.getConnection(); conn.close(); + xaconn.close(); // Chinese user J2EEDataSource.setBeanProperty(ds, "user", "\u4e10"); xaconn = ds.getXAConnection(); conn = xaconn.getConnection(); conn.close(); + xaconn.close(); // Chinese password J2EEDataSource.setBeanProperty(ds, "password", "\u4e10"); xaconn = ds.getXAConnection(); conn = xaconn.getConnection(); conn.close(); + xaconn.close(); /* Add the created database for cleanup by tearDown() */ databasesForCleanup.add("\u4e10"); @@ -219,18 +222,21 @@ public class InternationalConnectTest ex PooledConnection poolConn = ds.getPooledConnection(); Connection conn = poolConn.getConnection(); conn.close(); + poolConn.close(); // Chinese user J2EEDataSource.setBeanProperty(ds, "user", "\u4e10"); poolConn = ds.getPooledConnection(); conn = poolConn.getConnection(); conn.close(); + poolConn.close(); // Chinese password J2EEDataSource.setBeanProperty(ds, "password", "\u4e10"); poolConn= ds.getPooledConnection(); conn = poolConn.getConnection(); conn.close(); + poolConn.close(); /* Add the created database for cleanup by tearDown() */ databasesForCleanup.add("\u4e10"); @@ -261,7 +267,7 @@ public class InternationalConnectTest ex } } - public void tearDown() throws SQLException { + public void tearDown() throws Exception { /* Iterate through the databases for cleanup and delete them */ for (int i=0; i