# HG changeset patch
# User dsamersoff
# Date 1379866063 -7200
# Node ID ae2edb3df7fbfccb9f297890ad0a04888419bc25
# Parent  8ddc26f624760479e12480815247052b6273ac91# Parent  1f42d3ec1759f1a42f1c46cf399a42c25aa47245
Merge

diff -r 1f42d3ec1759 -r ae2edb3df7fb src/share/vm/services/attachListener.cpp
--- a/src/share/vm/services/attachListener.cpp	Sun Sep 22 18:49:09 2013 +0400
+++ b/src/share/vm/services/attachListener.cpp	Sun Sep 22 18:07:43 2013 +0200
@@ -470,7 +470,17 @@
                        vmSymbols::threadgroup_string_void_signature(),
                        thread_group,
                        string,
-                       CHECK);
+                       THREAD);
+
+  if (HAS_PENDING_EXCEPTION) {
+    tty->print_cr("Exception in VM (AttachListener::init) : ");
+    java_lang_Throwable::print(PENDING_EXCEPTION, tty);
+    tty->cr();
+
+    CLEAR_PENDING_EXCEPTION;
+
+    return;
+  }
 
   KlassHandle group(THREAD, SystemDictionary::ThreadGroup_klass());
   JavaCalls::call_special(&result,
@@ -479,7 +489,17 @@
                         vmSymbols::add_method_name(),
                         vmSymbols::thread_void_signature(),
                         thread_oop,             // ARG 1
-                        CHECK);
+                        THREAD);
+
+  if (HAS_PENDING_EXCEPTION) {
+    tty->print_cr("Exception in VM (AttachListener::init) : ");
+    java_lang_Throwable::print(PENDING_EXCEPTION, tty);
+    tty->cr();
+
+    CLEAR_PENDING_EXCEPTION;
+
+    return;
+  }
 
   { MutexLocker mu(Threads_lock);
     JavaThread* listener_thread = new JavaThread(&attach_listener_thread_entry);