You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2007/04/23 08:10:31 UTC

svn commit: r531345 - /db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java

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);