8298643: JNI call of getAccessibleRowWithIndex and getAccessibleColum…

…nWithIndex on a wrong thread Reviewed-by: serb, kizune
yadongw · Dec 23, 2022 · fd746a2 · fd746a2
1 parent da75de3
commit fd746a2
Showing 1 changed file with 10 additions and 18 deletions.
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/TableAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/TableAccessibility.m
@@ -88,28 +88,20 @@ - (id)getTableInfo:(jint)info
 
 - (int)accessibleRowAtIndex:(int)index
 {
-    JNIEnv *env = [ThreadUtilities getJNIEnv];
-    jobject axContext = [self axContextWithEnv:env];
-    if (axContext == NULL) return 0;
-    jclass clsInfo = (*env)->GetObjectClass(env, axContext);
-    DECLARE_METHOD_RETURN(jm_getAccessibleRowAtIndex, clsInfo, "getAccessibleRowAtIndex", "(I)I", -1);
-    jint rowAtIndex = (*env)->CallIntMethod(env, axContext, jm_getAccessibleRowAtIndex, (jint)index);
-    CHECK_EXCEPTION();
-    (*env)->DeleteLocalRef(env, axContext);
-    return (int)rowAtIndex;
+    int columnCount = [self accessibilityColumnCount];
+    if (columnCount != 0) {
+        return index / columnCount;
+    }
+    return -1;
 }
 
 - (int)accessibleColumnAtIndex:(int)index
 {
-    JNIEnv *env = [ThreadUtilities getJNIEnv];
-    jobject axContext = [self axContextWithEnv:env];
-    if (axContext == NULL) return 0;
-    jclass clsInfo = (*env)->GetObjectClass(env, axContext);
-    DECLARE_METHOD_RETURN(jm_getAccessibleColumnAtIndex, clsInfo, "getAccessibleColumnAtIndex", "(I)I", -1);
-    jint columnAtIndex = (*env)->CallIntMethod(env, axContext, jm_getAccessibleColumnAtIndex, (jint)index);
-    CHECK_EXCEPTION();
-    (*env)->DeleteLocalRef(env, axContext);
-    return (int)columnAtIndex;
+    int columnCount = [self accessibilityColumnCount];
+    if (columnCount != 0) {
+        return index % columnCount;
+    }
+    return -1;
 }
 
 - (BOOL) isAccessibleChildSelectedFromIndex:(int)index