diff -r be8afc1274ff -r 0c596dc28ed7 hotspot/src/share/vm/runtime/thread.cpp
--- a/hotspot/src/share/vm/runtime/thread.cpp	Mon Feb 29 15:42:34 2016 +0000
+++ b/hotspot/src/share/vm/runtime/thread.cpp	Mon Feb 29 08:50:57 2016 +0100
@@ -1806,10 +1806,6 @@
     // Call after last event on thread
     EVENT_THREAD_EXIT(this);
 
-    log_info(os, thread)("Thread " UINTX_FORMAT " %s.",
-      os::current_thread_id(),
-      exit_type == JavaThread::normal_exit ? "exiting" : "detaching");
-
     // Call Thread.exit(). We try 3 times in case we got another Thread.stop during
     // the execution of the method. If that is not enough, then we don't really care. Thread.stop
     // is deprecated anyhow.
@@ -1932,6 +1928,10 @@
   }
 #endif // INCLUDE_ALL_GCS
 
+  log_info(os, thread)("JavaThread %s (tid: " UINTX_FORMAT ").",
+    exit_type == JavaThread::normal_exit ? "exiting" : "detaching",
+    os::current_thread_id());
+
   // Remove from list of active threads list, and notify VM thread if we are the last non-daemon thread
   Threads::remove(this);
 }