You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2007/04/20 23:35:24 UTC

svn commit: r530924 - in /harmony/enhanced: classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c jdktools/trunk/modules/launcher/src/main/native/launcher/shared/main.c

Author: tellison
Date: Fri Apr 20 14:35:23 2007
New Revision: 530924

URL: http://svn.apache.org/viewvc?view=rev&rev=530924
Log:
Apply patch HARMONY-3713 ([classlib][launcher] DetachCurrentThread() is called before DestroyJavaVM())

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c
    harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/shared/main.c

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c?view=diff&rev=530924&r1=530923&r2=530924
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c Fri Apr 20 14:35:23 2007
@@ -741,7 +741,8 @@
     {
       hymem_free_memory (mainClassJar);
     }
-  (*jvm)->DetachCurrentThread(jvm);
+
+  // by spec we must call DestroyJavaVM without detaching main thread
   (*jvm)->DestroyJavaVM (jvm);
   /*if ((*jvm)->DestroyJavaVM(jvm)) {
      hytty_printf (PORTLIB, "Failed to destroy JVM\n");

Modified: harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/shared/main.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/shared/main.c?view=diff&rev=530924&r1=530923&r2=530924
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/shared/main.c (original)
+++ harmony/enhanced/jdktools/trunk/modules/launcher/src/main/native/launcher/shared/main.c Fri Apr 20 14:35:23 2007
@@ -718,7 +718,8 @@
     {
       hymem_free_memory (mainClassJar);
     }
-  (*jvm)->DetachCurrentThread(jvm);
+
+  // by spec we must call DestroyJavaVM without detaching main thread
   (*jvm)->DestroyJavaVM (jvm);
   /*if ((*jvm)->DestroyJavaVM(jvm)) {
      hytty_printf (PORTLIB, "Failed to destroy JVM\n");