OpenJDK / jdk / hs
changeset 3498:dbd1b49d341b
6851688: Hung up in applet application
Reviewed-by: art, dcherepanov
| author | uta |
|---|---|
| date | Fri, 31 Jul 2009 17:24:27 +0400 |
| parents | 415d5ebd455e |
| children | dd9363188303 |
| files | jdk/src/windows/native/sun/windows/awt_Toolkit.cpp jdk/src/windows/native/sun/windows/awt_Toolkit.h |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp Mon Jul 27 23:42:52 2009 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp Fri Jul 31 17:24:27 2009 +0400 @@ -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/jdk/src/windows/native/sun/windows/awt_Toolkit.h Mon Jul 27 23:42:52 2009 -0700 +++ b/jdk/src/windows/native/sun/windows/awt_Toolkit.h Fri Jul 31 17:24:27 2009 +0400 @@ -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();