changeset 2201:5fb3ee258e76

Merge
author coleenp
date Tue, 08 Feb 2011 19:50:41 -0500
parents fb539912d338 (diff) d8a72fbc4be7 (current diff)
children 5197f3d713a1
files make/closed.make
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/runtime/thread.cpp	Tue Feb 08 17:20:45 2011 -0500
+++ b/src/share/vm/runtime/thread.cpp	Tue Feb 08 19:50:41 2011 -0500
@@ -1611,7 +1611,15 @@
                                   uncaught_exception,  // Arg 2
                                   THREAD);
         }
-        CLEAR_PENDING_EXCEPTION;
+        if (HAS_PENDING_EXCEPTION) {
+          ResourceMark rm(this);
+          jio_fprintf(defaultStream::error_stream(),
+                "\nException: %s thrown from the UncaughtExceptionHandler"
+                " in thread \"%s\"\n",
+                Klass::cast(pending_exception()->klass())->external_name(),
+                get_thread_name());
+          CLEAR_PENDING_EXCEPTION;
+        }
       }
     }