db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r667136 - /db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
Date Thu, 12 Jun 2008 15:44:25 GMT
Author: mamta
Date: Thu Jun 12 08:44:25 2008
New Revision: 667136

URL: http://svn.apache.org/viewvc?rev=667136&view=rev
Log:
Backporting the fix for DERBY-3338 and DERBY-1848 into 10.3.3.1 codeline. This patch reworks
the code
which disassociates a StatementContext from the timer.


Modified:
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java?rev=667136&r1=667135&r2=667136&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
(original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
Thu Jun 12 08:44:25 2008
@@ -171,12 +171,10 @@
          * other executing statements.
          */
         public void forgetContext() {
-            boolean mayStillRun = !cancel();
-            if (mayStillRun) {
-                synchronized (this) {
-                    statementContext = null;
-                }
+            synchronized (this) {
+                statementContext = null;
             }
+            cancel();
         }
     }
 



Mime
View raw message