changeset 1553:e066c998e4f3

Merge
author yan
date Wed, 12 Aug 2009 00:32:35 -0700
parents 9ae4027c5fe1 e6f6765a20f2
children 5ff018677b2d
files
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/windows/awt_Toolkit.cpp	Thu Aug 06 10:25:18 2009 -0700
+++ b/src/windows/native/sun/windows/awt_Toolkit.cpp	Wed Aug 12 00:32:35 2009 -0700
@@ -1596,18 +1596,18 @@
 }
 
 JNIEnv* AwtToolkit::m_env;
-HANDLE AwtToolkit::m_thread;
+DWORD AwtToolkit::m_threadId;
 
 void AwtToolkit::SetEnv(JNIEnv *env) {
     if (m_env != NULL) { // If already cashed (by means of embeddedInit() call).
         return;
     }
-    m_thread = GetCurrentThread();
+    m_threadId = GetCurrentThreadId();
     m_env = env;
 }
 
 JNIEnv* AwtToolkit::GetEnv() {
-    return (m_env == NULL || m_thread != GetCurrentThread()) ?
+    return (m_env == NULL || m_threadId != GetCurrentThreadId()) ?
         (JNIEnv*)JNU_GetEnv(jvm, JNI_VERSION_1_2) : m_env;
 }
 
--- a/src/windows/native/sun/windows/awt_Toolkit.h	Thu Aug 06 10:25:18 2009 -0700
+++ b/src/windows/native/sun/windows/awt_Toolkit.h	Wed Aug 12 00:32:35 2009 -0700
@@ -442,7 +442,7 @@
 
  private:
     static JNIEnv *m_env;
-    static HANDLE m_thread;
+    static DWORD m_threadId;
  public:
     static void SetEnv(JNIEnv *env);
     static JNIEnv* GetEnv();