Author: mamta
Date: Wed Jun 11 15:10:56 2008
New Revision: 666871

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


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

Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java?rev=666871&r1=666870&r2=666871&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java (original)
+++ db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java Wed Jun 11 15:10:56 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();
         }
     }