db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1151118 - in /db/derby/code/branches/10.8: ./ java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
Date Tue, 26 Jul 2011 14:39:24 GMT
Author: dag
Date: Tue Jul 26 14:39:24 2011
New Revision: 1151118

URL: http://svn.apache.org/viewvc?rev=1151118&view=rev
Log:
DERBY-5333 Intermittent assert failure in testInterruptShutdown: thread's interrupted flag
lost after shutdown

Backported patch derby-5333a from trunk as:

  svn merge -c 1151101 https://svn.apache.org/repos/asf/db/derby/code/trunk

Patch derby-5333a fixes two instances where we neglected to note that
an interrupt had occured while in a wait call. They were missed during
the first code inspection because they appeared to be part of daemon
code from a superficial inspection, but the code was in fact called by
session threads (for which we expect interrupts).


Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 26 14:39:24 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133304,1133317,1133741,1133752,1136363,1136371,1136397,1136844,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1141924,1142583,1142635,1146915,1146962,1148658
+/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133304,1133317,1133741,1133752,1136363,1136371,1136397,1136844,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1141924,1142583,1142635,1146915,1146962,1148658,1151101

Modified: db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java?rev=1151118&r1=1151117&r2=1151118&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
(original)
+++ db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
Tue Jul 26 14:39:24 2011
@@ -33,6 +33,7 @@ import org.apache.derby.iapi.error.Stand
 
 import java.util.Vector;
 import java.util.List;
+import org.apache.derby.iapi.util.InterruptStatus;
 
 /**
 	A BasicDaemon is a background worker thread which does asynchronous I/O and
@@ -441,7 +442,7 @@ public class BasicDaemon implements Daem
 				}
 				catch (InterruptedException ie)				
 				{
-					// someone interrrupt us, done running
+                    InterruptStatus.setInterrupted();
 				}
 			}
 		}
@@ -522,8 +523,8 @@ public class BasicDaemon implements Daem
 						wait();
 					}catch (InterruptedException ie)
 					{
-						// someone interrupt us, see what's going on
-					}
+                        InterruptStatus.setInterrupted();
+                    }
 				}
 			}
 		}



Mime
View raw message