Changeset 335 for trunk/openjdk

Timestamp:

Feb 24, 2012, 11:08:49 PM (13 years ago)

Author:

dmik

Message:

jdk: Call ctorDtorInit() before DllMain().

This is needed as DllMain may already access static/global
C++ objects. This is a regression of r332.

File:

• trunk/openjdk/jdk/src/os2/native/common/jdk_DllMain.cpp (modified) (2 diffs)

trunk/openjdk/jdk/src/os2/native/common/jdk_DllMain.cpp

@@ -74 +74 @@
     switch (ulFlag) {
         case 0 :
+            // important to call constructors before DllMain
+            __ctordtorInit();
+
             dllHandle = RegisterLxDll(hModule, DefaultDllMain, NULL,
                                       ODINNT_MAJOR_VERSION,
@@ -80 +83 @@
             if (dllHandle == 0)
                 break;
-
-            __ctordtorInit();
-
             return 1;