From a4142667f3d7238882c997c8401fccd86390575e Mon Sep 17 00:00:00 2001
From: Dmitry Cherepanov <dcherepanov@openjdk.org>
Date: Mon, 27 Dec 2010 18:43:55 +0300
Subject: [PATCH] 6866808: nsk/stress/jck12a/jck12a014 crashes with SIGSEGV at
[libjvm.so+0xc5b10]
Reviewed-by: art
---
jdk/src/solaris/native/sun/xawt/XToolkit.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/solaris/native/sun/xawt/XToolkit.c
index 72024178041..4ea63143c70 100644
--- a/jdk/src/solaris/native/sun/xawt/XToolkit.c
+++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c
@@ -187,7 +187,9 @@ Java_java_awt_Component_initIDs
"()Ljava/awt/Point;");
keyclass = (*env)->FindClass(env, "java/awt/event/KeyEvent");
- DASSERT (keyclass != NULL);
+ if (JNU_IsNull(env, keyclass)) {
+ return;
+ }
componentIDs.isProxyActive =
(*env)->GetFieldID(env, keyclass, "isProxyActive",
@@ -715,8 +717,10 @@ Window get_xawt_root_shell(JNIEnv *env) {
if (xawt_root_shell == None){
if (classXRootWindow == NULL){
jclass cls_tmp = (*env)->FindClass(env, "sun/awt/X11/XRootWindow");
- classXRootWindow = (jclass)(*env)->NewGlobalRef(env, cls_tmp);
- (*env)->DeleteLocalRef(env, cls_tmp);
+ if (!JNU_IsNull(env, cls_tmp)) {
+ classXRootWindow = (jclass)(*env)->NewGlobalRef(env, cls_tmp);
+ (*env)->DeleteLocalRef(env, cls_tmp);
+ }
}
if( classXRootWindow != NULL) {
methodGetXRootWindow = (*env)->GetStaticMethodID(env, classXRootWindow, "getXRootWindow", "()J");