commit 2073369254ae12f87f9317c0efc9e9655f82f711
author Narayan Kamath <narayan@google.com> Tue Nov 24 19:02:48 2015 +0000
committer Narayan Kamath <narayan@google.com> Tue Nov 24 19:02:48 2015 +0000
tree c3e460c4432b425c9f4da46694cb32a18a671299
parent 53812d5bed3ca63f063fcfad2dfd19f63c54d963

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

diff --git a/test/030-bad-finalizer/expected.txt b/test/030-bad-finalizer/expected.txt
index c1f3f4f..ee9cfff 100644
--- a/test/030-bad-finalizer/expected.txt
+++ b/test/030-bad-finalizer/expected.txt
@@ -2,4 +2,3 @@
 Finalizer started and spinning...
 Finalizer done spinning.
 Finalizer sleeping forever now.
-Caught exception: Main$BadFinalizer.finalize() timed out after 10 seconds

test/030-bad-finalizer/src/Main.java

diff --git a/test/030-bad-finalizer/src/Main.java b/test/030-bad-finalizer/src/Main.java
index 79b53ef..942ee25 100644
--- a/test/030-bad-finalizer/src/Main.java
+++ b/test/030-bad-finalizer/src/Main.java
@@ -21,15 +21,6 @@
     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();

test/059-finalizer-throw/expected.txt

diff --git a/test/059-finalizer-throw/expected.txt b/test/059-finalizer-throw/expected.txt
index fb4c3aa..cbc9ece 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

test/059-finalizer-throw/src/Main.java

diff --git a/test/059-finalizer-throw/src/Main.java b/test/059-finalizer-throw/src/Main.java
index e863e83..fa80fe3 100644
--- a/test/059-finalizer-throw/src/Main.java
+++ b/test/059-finalizer-throw/src/Main.java
@@ -30,14 +30,6 @@
     }
 
     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 @@
         } catch (InterruptedException ie) {
             System.err.println(ie);
         }
+
+        System.out.println("done");
     }
 
     protected void finalize() throws Throwable {