--- old/src/java.base/share/native/libjli/java.c	2016-04-14 00:24:27.505439693 +0900
+++ new/src/java.base/share/native/libjli/java.c	2016-04-14 00:24:27.332440451 +0900
@@ -253,6 +253,7 @@
 
     ifn.CreateJavaVM = 0;
     ifn.GetDefaultJavaVMInitArgs = 0;
+    ifn.SetNativeThreadName0 = 0;
 
     if (JLI_IsTraceLauncher()) {
         start = CounterGet();
@@ -331,6 +332,7 @@
             ret = 1; \
         } \
         if (JNI_TRUE) { \
+            ifn.SetNativeThreadName0("DestroyJavaVM"); \
             (*vm)->DestroyJavaVM(vm); \
             return ret; \
         } \
@@ -488,6 +490,9 @@
     mainArgs = CreateApplicationArgs(env, argv, argc);
     CHECK_EXCEPTION_NULL_LEAVE(mainArgs);
 
+    /* Set native thread name */
+    ifn.SetNativeThreadName0("main");
+
     /* Invoke main method. */
     (*env)->CallStaticVoidMethod(env, mainClass, mainID, mainArgs);