Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 36983 invoked from network); 23 Apr 2007 06:10:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Apr 2007 06:10:53 -0000 Received: (qmail 54438 invoked by uid 500); 23 Apr 2007 06:10:59 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 54405 invoked by uid 500); 23 Apr 2007 06:10:59 -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 54390 invoked by uid 99); 23 Apr 2007 06:10:59 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Apr 2007 23:10:59 -0700 X-ASF-Spam-Status: No, hits=-99.5 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; Sun, 22 Apr 2007 23:10:52 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id DF0991A9838; Sun, 22 Apr 2007 23:10:31 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r531345 - /db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java Date: Mon, 23 Apr 2007 06:10:31 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070423061031.DF0991A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kahatlen Date: Sun Apr 22 23:10:30 2007 New Revision: 531345 URL: http://svn.apache.org/viewvc?view=rev&rev=531345 Log: DERBY-2566: OutOfMemory/Sanity-assert failed when updating database Merged fix from trunk (revision 531170). Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java?view=diff&rev=531345&r1=531344&r2=531345 ============================================================================== --- db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java (original) +++ db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java Sun Apr 22 23:10:30 2007 @@ -3679,6 +3679,7 @@ ps.execute(act, true, 0L); rs.close(); rs.finish(); + act.close(); lcc.popStatementContext(statementContext, null); } catch (StandardException t) { @@ -3759,6 +3760,7 @@ } rs.close(); rs.finish(); + act.close(); //For forward only resultsets, after a update, the ResultSet will be positioned right before the next row. if (getType() == TYPE_FORWARD_ONLY) { currentRow.setRowArray(null); @@ -3824,6 +3826,7 @@ } rs.close(); rs.finish(); + act.close(); //After a delete, the ResultSet will be positioned right before //the next row. currentRow.setRowArray(null);