db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r606924 - in /db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute: AlterTableConstantAction.java NoRowsResultSetImpl.java
Date Wed, 26 Dec 2007 17:59:21 GMT
Author: mamta
Date: Wed Dec 26 09:59:20 2007
New Revision: 606924

URL: http://svn.apache.org/viewvc?rev=606924&view=rev
Log:
DERBY-3037

Merging change(606106) from trunk into 10.3.2.2 codeline (The derbyall and junit tests have
run with no problems.)

The commit comments for 606106 were as follows

With this patch(Derby_3037_AlterTableConstantActionChanges_v1_diff.txt), I am removing the
Language 
Resultset.finish from AlterTableConstantAction. In addition, like Dan mentioned, what's being
created in this part 
of AlterTableConstantAction is a single use activation which should be closed when its language
Resultset is closed.
In order to achieve that, I have added following code in NoRowsResultSetImpl.close to take
care of the activation 
+ if (activation.isSingleExecution()) 
+ activation.close(); 



Modified:
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java?rev=606924&r1=606923&r2=606924&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
(original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
Wed Dec 26 09:59:20 2007
@@ -2239,7 +2239,6 @@
         // timeout to its parent statement's timeout settings.
 		ResultSet rs = ps.execute(lcc, true, 0L);
 		rs.close();
-		rs.finish();
 	}
 
 	/**

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java?rev=606924&r1=606923&r2=606924&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
(original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
Wed Dec 26 09:59:20 2007
@@ -353,6 +353,9 @@
 	 */
 	public void	close() throws StandardException
 	{ 
+		if (!isOpen)
+			return;
+
 		if (! dumpedStats)
 		{
 			/*
@@ -409,7 +412,11 @@
 			}
 			subqueryTrackingArray[index].close();
 		}
+
 		isOpen = false;
+
+		if (activation.isSingleExecution())
+			activation.close();
 	}
 
 	/**



Mime
View raw message