From 2073369254ae12f87f9317c0efc9e9655f82f711 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Tue, 24 Nov 2015 19:02:48 +0000
Subject: [PATCH] Revert "Fix 030-bad-finalizer & 059-finalizer-throw."

This reverts commit 13ca74fed068a6a49221b5213ce0b1bebeda3ed6.

This is now not needed, and the libcore side of this cleanup has
been reverted as it's problematic. The test passes without this
cleanup.
---
 test/030-bad-finalizer/expected.txt    |  1 -
 test/030-bad-finalizer/src/Main.java   |  9 ---------
 test/059-finalizer-throw/expected.txt  |  2 +-
 test/059-finalizer-throw/src/Main.java | 10 ++--------
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/test/030-bad-finalizer/expected.txt b/test/030-bad-finalizer/expected.txt
index c1f3f4fc4..ee9cfff10 100644
--- a/test/030-bad-finalizer/expected.txt
+++ b/test/030-bad-finalizer/expected.txt
@@ -2,4 +2,3 @@ About to null reference and request GC.
 Finalizer started and spinning...
 Finalizer done spinning.
 Finalizer sleeping forever now.
-Caught exception: Main$BadFinalizer.finalize() timed out after 10 seconds
diff --git a/test/030-bad-finalizer/src/Main.java b/test/030-bad-finalizer/src/Main.java
index 79b53effc..942ee2590 100644
--- a/test/030-bad-finalizer/src/Main.java
+++ b/test/030-bad-finalizer/src/Main.java
@@ -21,15 +21,6 @@ public class Main {
     public static void main(String[] args) {
         BadFinalizer bf = new BadFinalizer();
 
-        Thread.setDefaultUncaughtExceptionHandler(
-            new Thread.UncaughtExceptionHandler() {
-                @Override
-                public void uncaughtException(Thread t, Throwable e) {
-                    System.out.println("Caught exception: " + e.getMessage());
-                    System.exit(0);
-                }
-            });
-
         System.out.println("About to null reference and request GC.");
         bf = null;
         Runtime.getRuntime().gc();
diff --git a/test/059-finalizer-throw/expected.txt b/test/059-finalizer-throw/expected.txt
index fb4c3aaf6..cbc9ece76 100644
--- a/test/059-finalizer-throw/expected.txt
+++ b/test/059-finalizer-throw/expected.txt
@@ -1,2 +1,2 @@
 In finalizer
-Caught exception: whee
+done
diff --git a/test/059-finalizer-throw/src/Main.java b/test/059-finalizer-throw/src/Main.java
index e863e8370..fa80fe3f7 100644
--- a/test/059-finalizer-throw/src/Main.java
+++ b/test/059-finalizer-throw/src/Main.java
@@ -30,14 +30,6 @@ public class Main {
     }
 
     public static void main(String[] args) {
-        Thread.setDefaultUncaughtExceptionHandler(
-            new Thread.UncaughtExceptionHandler() {
-                @Override
-                public void uncaughtException(Thread t, Throwable e) {
-                    System.out.println("Caught exception: " + e.getMessage());
-                }
-            });
-
         createAndForget();
 
         System.gc();
@@ -64,6 +56,8 @@ public class Main {
         } catch (InterruptedException ie) {
             System.err.println(ie);
         }
+
+        System.out.println("done");
     }
 
     protected void finalize() throws Throwable {
-- 
2.11.0