changeset 20139:53e1e07a811e

8024779: [macosx] SwingNode crashes on exit Reviewed-by: anthony, ant
author pchelko
date Mon, 16 Sep 2013 19:38:32 +0400
parents 7103851d7850
children b17201ff7e3f
files jdk/src/macosx/native/sun/awt/AWTView.m jdk/src/macosx/native/sun/awt/AWTWindow.m
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/macosx/native/sun/awt/AWTView.m	Mon Sep 16 19:21:50 2013 +0400
+++ b/jdk/src/macosx/native/sun/awt/AWTView.m	Mon Sep 16 19:38:32 2013 +0400
@@ -126,7 +126,7 @@
 
     self.cglLayer = nil;
 
-    JNIEnv *env = [ThreadUtilities getJNIEnv];
+    JNIEnv *env = [ThreadUtilities getJNIEnvUncached];
     (*env)->DeleteGlobalRef(env, m_cPlatformView);
     m_cPlatformView = NULL;
 
--- a/jdk/src/macosx/native/sun/awt/AWTWindow.m	Mon Sep 16 19:21:50 2013 +0400
+++ b/jdk/src/macosx/native/sun/awt/AWTWindow.m	Mon Sep 16 19:38:32 2013 +0400
@@ -350,7 +350,7 @@
 - (void) dealloc {
 AWT_ASSERT_APPKIT_THREAD;
 
-    JNIEnv *env = [ThreadUtilities getJNIEnv];
+    JNIEnv *env = [ThreadUtilities getJNIEnvUncached];
     [self.javaPlatformWindow setJObject:nil withEnv:env];
 
     self.nsWindow = nil;