Changeset 335


Ignore:
Timestamp:
Feb 24, 2012, 10:08:49 PM (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/openjdk/jdk/src/os2/native/common/jdk_DllMain.cpp

    r332 r335  
    7474    switch (ulFlag) {
    7575        case 0 :
     76            // important to call constructors before DllMain
     77            __ctordtorInit();
     78
    7679            dllHandle = RegisterLxDll(hModule, DefaultDllMain, NULL,
    7780                                      ODINNT_MAJOR_VERSION,
     
    8083            if (dllHandle == 0)
    8184                break;
    82 
    83             __ctordtorInit();
    84 
    8585            return 1;
    8686
Note: See TracChangeset for help on using the changeset viewer.