Index: java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java	(revision 605222)
+++ java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java	(working copy)
@@ -330,6 +330,9 @@
 	 */
 	public void	close() throws StandardException
 	{ 
+		if (!isOpen)
+			return;
+
 		if (! dumpedStats)
 		{
 			/*
@@ -386,7 +389,11 @@
 			}
 			subqueryTrackingArray[index].close();
 		}
+
 		isOpen = false;
+
+		if (activation.isSingleExecution())
+			activation.close();
 	}
 
 	/**
Index: java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java	(revision 605222)
+++ java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java	(working copy)
@@ -2239,7 +2239,6 @@
         // timeout to its parent statement's timeout settings.
 		ResultSet rs = ps.execute(lcc, true, 0L);
 		rs.close();
-		rs.finish();
 	}
 
 	/**