--- a/JavaNativeMethodImpl_OpenJDK6.st	Thu Mar 03 16:26:03 2016 +0100
+++ b/JavaNativeMethodImpl_OpenJDK6.st	Tue Apr 05 18:04:13 2016 +0200
@@ -2436,9 +2436,9 @@
     JavaEventThread := Processor activeProcess.
     [
         [ true ] whileTrue: [
-            AbortSignal handle: [:ex | ex return ] do: [ self doWindowsEventThread. ]
-        ].
-    ] valueNowOrOnUnwindDo: [ JavaEventThread := nil. ].
+            AbortOperationRequest handle: [:ex | ex return ] do: [ self doWindowsEventThread. ]
+        ].
+    ] ensure:[ JavaEventThread := nil].
 
     "Created: / 17-11-1998 / 23:04:29 / cg"
     "Modified: / 08-01-1999 / 17:08:21 / cg"
@@ -6505,13 +6505,13 @@
     JavaEventThread := Processor activeProcess.
     [
         [true] whileTrue:[
-            AbortSignal handle:[:ex |
+            AbortOperationRequest handle:[:ex |
                 ex return
             ] do:[
                 self doWindowsEventThread.
             ]
         ].
-    ] valueNowOrOnUnwindDo:[
+    ] ensure:[
         JavaEventThread := nil.
     ].