8024779: [macosx] SwingNode crashes on exit

Reviewed-by: anthony, ant

8024779: [macosx] SwingNode crashes on exit
Reviewed-by: anthony, ant
d5114ebd · pchelko · 3a38e6c9 · d5114ebd · d5114ebd
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

src/macosx/native/sun/awt/AWTView.m src/macosx/native/sun/awt/AWTView.m +1 -1

src/macosx/native/sun/awt/AWTWindow.m src/macosx/native/sun/awt/AWTWindow.m +1 -1

未找到文件。
--- a/src/macosx/native/sun/awt/AWTView.m
+++ b/src/macosx/native/sun/awt/AWTView.m
@@ -126,7 +126,7 @@ AWT_ASSERT_APPKIT_THREAD;

    self.cglLayer = nil;

-    JNIEnv *env = [ThreadUtilities getJNIEnv];
+    JNIEnv *env = [ThreadUtilities getJNIEnvUncached];
    (*env)->DeleteGlobalRef(env, m_cPlatformView);
    m_cPlatformView = NULL;


--- a/src/macosx/native/sun/awt/AWTWindow.m
+++ b/src/macosx/native/sun/awt/AWTWindow.m
@@ -350,7 +350,7 @@ AWT_ASSERT_APPKIT_THREAD;
 - (void) dealloc {
 AWT_ASSERT_APPKIT_THREAD;

-    JNIEnv *env = [ThreadUtilities getJNIEnv];
+    JNIEnv *env = [ThreadUtilities getJNIEnvUncached];
    [self.javaPlatformWindow setJObject:nil withEnv:env];

    self.nsWindow = nil;