No need to explicitly capture thread reference in Cleanup object, as it's an inner class.

1 files changed, 2 insertions, 8 deletions

diff --git a/openjdk/java/lang/Thread.java b/openjdk/java/lang/Thread.java
index 0ed60578..fefed5e3 100644
--- a/openjdk/java/lang/Thread.java
+++ b/openjdk/java/lang/Thread.java
@@ -151,14 +151,8 @@ class Thread implements Runnable {
         // body replaced in map.xml
     }
     final class Cleanup {
-        private final Thread thread;
-
-        Cleanup(Thread thread) {
-            this.thread = thread;
-        }
-
         protected void finalize() {
-            thread.die();
+            Thread.this.die();
         }
     }
     /* --- start IKVM specific state --- */
@@ -560,7 +554,7 @@ class Thread implements Runnable {
         }
 
         current = this;
-        cleanup = new Cleanup(this);
+        cleanup = new Cleanup();
 
         if (!daemon) {
             cli.System.Threading.Interlocked.Increment(nonDaemonCount);