commit 82936fe396bb4ac1464bc89f2aa5cedb00a071ee
author yan <none@none> Wed Aug 12 00:32:35 2009 -0700
committer yan <none@none> Wed Aug 12 00:32:35 2009 -0700
tree 70f889273f465969d5ed8008b5cb97cd982c0eb2
parent 240927fdf2dbc2d3ddb8c1bf08e6e10e8426ca8d
parent a89c346de245c5e1c4efeae78d5ac42f871d5cb1

Merge

src/windows/native/sun/windows/awt_Toolkit.cpp

diff --git a/src/windows/native/sun/windows/awt_Toolkit.cpp b/src/windows/native/sun/windows/awt_Toolkit.cpp
index 5158ef6..b612bd1 100644
--- a/src/windows/native/sun/windows/awt_Toolkit.cpp
+++ b/src/windows/native/sun/windows/awt_Toolkit.cpp
@@ -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;
 }
 

src/windows/native/sun/windows/awt_Toolkit.h

diff --git a/src/windows/native/sun/windows/awt_Toolkit.h b/src/windows/native/sun/windows/awt_Toolkit.h
index 0673201..efaf9ff 100644
--- a/src/windows/native/sun/windows/awt_Toolkit.h
+++ b/src/windows/native/sun/windows/awt_Toolkit.h
@@ -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();