db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r763901 - in /db/derby/code/branches/10.5/java: engine/org/apache/derby/impl/sql/execute/ testing/org/apache/derbyTesting/functionTests/tests/lang/
Date Fri, 10 Apr 2009 10:06:07 GMT
Author: kahatlen
Date: Fri Apr 10 10:06:06 2009
New Revision: 763901

URL: http://svn.apache.org/viewvc?rev=763901&view=rev
Log:
DERBY-2353: intermittent NPEs during DELETE ops in a reasonably large transaction

Merged revision 763900 from trunk.

Added:
    db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ReferentialActionsTest.java
      - copied unchanged from r763900, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ReferentialActionsTest.java
Modified:
    db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
    db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java

Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java?rev=763901&r1=763900&r2=763901&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
(original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
Fri Apr 10 10:06:06 2009
@@ -351,9 +351,16 @@
 			** is on, then the run time statistics from the autocommit is the
 			** only one that the user would ever see.  So, we don't overwrite
 			** the run time statistics object for a commit.
+            ** DERBY-2353: Also make an exception when the activation is
+            ** closed. If the activation is closed, the run time statistics
+            ** object is null and there's nothing to print. This may happen
+            ** if a top-level result set closes the activation and close() is
+            ** subsequently called on the child result sets. The information
+            ** about the children is also printed by the parent, so it's safe
+            ** to skip printing it.
 			*/
 			if (lcc.getRunTimeStatisticsMode() &&
-				! doesCommit())
+				!doesCommit() && !activation.isClosed())
 			{
 				endExecutionTime = getCurrentTimeMillis();
 

Modified: db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java?rev=763901&r1=763900&r2=763901&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
(original)
+++ db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
Fri Apr 10 10:06:06 2009
@@ -70,6 +70,7 @@
 		suite.addTest(LangScripts.suite());
         suite.addTest(MathTrigFunctionsTest.suite());
         suite.addTest(PrepareExecuteDDL.suite());
+        suite.addTest(ReferentialActionsTest.suite());
         suite.addTest(RolesTest.suite());
         suite.addTest(RolesConferredPrivilegesTest.suite());
         suite.addTest(SQLSessionContextTest.suite());



Mime
View raw message