From 603e50f355fd97661b8ce4231f8f0ddc629e4e39 Mon Sep 17 00:00:00 2001
From: John Coomes <jcoomes@openjdk.org>
Date: Thu, 30 Sep 2010 12:15:13 -0700
Subject: [PATCH] 6988678: fatal error deadlock handling was unintentionally
 disabled

Reviewed-by: ysr
---
 hotspot/src/share/vm/runtime/thread.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp
index 87e22fc4982..00e5e991efc 100644
--- a/hotspot/src/share/vm/runtime/thread.cpp
+++ b/hotspot/src/share/vm/runtime/thread.cpp
@@ -1073,7 +1073,6 @@ void WatcherThread::run() {
       }
     }
 
-#if 0
     if (is_error_reported()) {
       // A fatal error has happened, the error handler(VMError::report_and_die)
       // should abort JVM after creating an error log file. However in some
@@ -1101,7 +1100,6 @@ void WatcherThread::run() {
         os::sleep(this, 5 * 1000, false);
       }
     }
-#endif // #if 0
 
     PeriodicTask::real_time_tick(time_to_wait);