SF1687419 AttachCurrentThread was being passed incorrect parameters. The 1.2 API implementation has never been correct.

This commit is contained in:
clay_shooter
2007-03-24 14:58:47 +00:00
parent 1647919dee
commit 42d53349ef

View File

@@ -66,7 +66,11 @@ EventProxy::~EventProxy()
if (env->ExceptionOccurred()) { env->ExceptionDescribe(); env->ExceptionClear();} if (env->ExceptionOccurred()) { env->ExceptionDescribe(); env->ExceptionClear();}
if (vmConnectionStatus == JNI_EDETACHED){ if (vmConnectionStatus == JNI_EDETACHED){
//printf("Unhook: Attaching to current thread using JNI Version 1.2 (%d)\n",vmConnectionStatus); //printf("Unhook: Attaching to current thread using JNI Version 1.2 (%d)\n",vmConnectionStatus);
jvm->AttachCurrentThread((void **)&env, jvm); JavaVMAttachArgs attachmentArgs;
attachmentArgs.version = JNI_VERSION_1_2;
attachmentArgs.name = NULL;
attachmentArgs.group = NULL;
jvm->AttachCurrentThread((void **)&env, &attachmentArgs);
if (env->ExceptionOccurred()) { env->ExceptionDescribe(); env->ExceptionClear();} if (env->ExceptionOccurred()) { env->ExceptionDescribe(); env->ExceptionClear();}
} else { } else {
// should really look for JNI_OK versus an error // should really look for JNI_OK versus an error
@@ -140,7 +144,11 @@ STDMETHODIMP EventProxy::Invoke(DISPID dispID, REFIID riid,
// attach to the current running thread // attach to the current running thread
//printf("Invoke: Attaching to current thread using JNI Version 1.2\n"); //printf("Invoke: Attaching to current thread using JNI Version 1.2\n");
jvm->AttachCurrentThread((void **)&env, jvm); JavaVMAttachArgs attachmentArgs;
attachmentArgs.version = JNI_VERSION_1_2;
attachmentArgs.name = NULL;
attachmentArgs.group = NULL;
jvm->AttachCurrentThread((void **)&env, &attachmentArgs);
if (env->ExceptionOccurred()) { env->ExceptionDescribe(); env->ExceptionClear();} if (env->ExceptionOccurred()) { env->ExceptionDescribe(); env->ExceptionClear();}
if (!eventMethodName) if (!eventMethodName)