Skip to content

Commit aac1f9a

Browse files
author
Laurent Bourgès
committedNov 19, 2024
8341793: Fix ExceptionOccurred in jdk.accessibility
Reviewed-by: prr, avu
·
jdk-25+13jdk-24+25
1 parent cd45ba3 commit aac1f9a

File tree

1 file changed

+30
-112
lines changed

1 file changed

+30
-112
lines changed
 

‎src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp

+30-112
Original file line numberDiff line numberDiff line change
@@ -74,36 +74,36 @@ AccessBridgeJavaEntryPoints::~AccessBridgeJavaEntryPoints() {
7474
return FALSE; \
7575
}
7676

77-
#define EXCEPTION_CHECK(situationDescription, returnVal) \
78-
if (exception = jniEnv->ExceptionOccurred()) { \
79-
PrintDebugString("[ERROR]: *** Exception occured while doing: %s; returning %d", situationDescription, returnVal); \
80-
jniEnv->ExceptionDescribe(); \
81-
jniEnv->ExceptionClear(); \
82-
return (returnVal); \
83-
}
84-
85-
#define EXCEPTION_CHECK_WITH_RELEASE(situationDescription, returnVal, js, stringBytes) \
86-
if (exception = jniEnv->ExceptionOccurred()) { \
87-
PrintDebugString("[ERROR]: *** Exception occured while doing: %s - call to GetStringLength; returning %d", situationDescription, returnVal); \
88-
jniEnv->ExceptionDescribe(); \
89-
jniEnv->ExceptionClear(); \
90-
jniEnv->ReleaseStringChars(js, stringBytes); \
91-
return (returnVal); \
92-
} \
93-
jniEnv->ReleaseStringChars(js, stringBytes); \
94-
if (exception = jniEnv->ExceptionOccurred()) { \
95-
PrintDebugString("[ERROR]: *** Exception occured while doing: %s - call to ReleaseStringChars; returning %d", situationDescription, returnVal); \
96-
jniEnv->ExceptionDescribe(); \
97-
jniEnv->ExceptionClear(); \
98-
return (returnVal); \
99-
}
100-
101-
#define EXCEPTION_CHECK_VOID(situationDescription) \
102-
if (exception = jniEnv->ExceptionOccurred()) { \
77+
#define EXCEPTION_CHECK(situationDescription, returnVal) \
78+
if (jniEnv->ExceptionCheck()) { \
79+
PrintDebugString("[ERROR]: *** Exception occured while doing: %s; returning %d", situationDescription, returnVal); \
80+
jniEnv->ExceptionDescribe(); \
81+
jniEnv->ExceptionClear(); \
82+
return (returnVal); \
83+
}
84+
85+
#define EXCEPTION_CHECK_WITH_RELEASE(situationDescription, returnVal, js, stringBytes) \
86+
if (jniEnv->ExceptionCheck()) { \
87+
PrintDebugString("[ERROR]: *** Exception occured while doing: %s - call to GetStringLength; returning %d", situationDescription, returnVal); \
88+
jniEnv->ExceptionDescribe(); \
89+
jniEnv->ExceptionClear(); \
90+
jniEnv->ReleaseStringChars(js, stringBytes); \
91+
return (returnVal); \
92+
} \
93+
jniEnv->ReleaseStringChars(js, stringBytes); \
94+
if (jniEnv->ExceptionCheck()) { \
95+
PrintDebugString("[ERROR]: *** Exception occured while doing: %s - call to ReleaseStringChars; returning %d", situationDescription, returnVal); \
96+
jniEnv->ExceptionDescribe(); \
97+
jniEnv->ExceptionClear(); \
98+
return (returnVal); \
99+
}
100+
101+
#define EXCEPTION_CHECK_VOID(situationDescription) \
102+
if (jniEnv->ExceptionCheck()) { \
103103
PrintDebugString("[ERROR]: *** Exception occured while doing: %s", situationDescription); \
104-
jniEnv->ExceptionDescribe(); \
105-
jniEnv->ExceptionClear(); \
106-
return; \
104+
jniEnv->ExceptionDescribe(); \
105+
jniEnv->ExceptionClear(); \
106+
return; \
107107
}
108108

109109
/**
@@ -890,7 +890,6 @@ AccessBridgeJavaEntryPoints::BuildJavaEntryPoints() {
890890
*/
891891
BOOL
892892
AccessBridgeJavaEntryPoints::isJavaWindow(jint window) {
893-
jthrowable exception;
894893
BOOL returnVal;
895894

896895
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::isJavaWindow(%X):", window);
@@ -913,7 +912,6 @@ AccessBridgeJavaEntryPoints::isJavaWindow(jint window) {
913912
*/
914913
BOOL
915914
AccessBridgeJavaEntryPoints::isSameObject(jobject obj1, jobject obj2) {
916-
jthrowable exception;
917915
BOOL returnVal;
918916

919917
PrintDebugString("[INFO]: In AccessBridgeJavaEntryPoints::isSameObject(%p %p):", obj1, obj2);
@@ -935,7 +933,6 @@ jobject
935933
AccessBridgeJavaEntryPoints::getAccessibleContextFromHWND(jint window) {
936934
jobject returnedAccessibleContext;
937935
jobject globalRef;
938-
jthrowable exception;
939936

940937
PrintDebugString("[INFO]: In AccessBridgeJavaEntryPoints::getAccessibleContextFromHWND(%X):", window);
941938

@@ -961,7 +958,6 @@ AccessBridgeJavaEntryPoints::getAccessibleContextFromHWND(jint window) {
961958
*/
962959
HWND
963960
AccessBridgeJavaEntryPoints::getHWNDFromAccessibleContext(jobject accessibleContext) {
964-
jthrowable exception;
965961
HWND rHWND;
966962

967963
PrintDebugString("[INFO]: In AccessBridgeJavaEntryPoints::getHWNDFromAccessibleContext(%X):",
@@ -987,7 +983,6 @@ AccessBridgeJavaEntryPoints::getHWNDFromAccessibleContext(jobject accessibleCont
987983
*/
988984
BOOL
989985
AccessBridgeJavaEntryPoints::setTextContents(const jobject accessibleContext, const wchar_t *text) {
990-
jthrowable exception;
991986
BOOL result = FALSE;
992987

993988
PrintDebugString("[INFO]: In AccessBridgeJavaEntryPoints::setTextContents(%p, %ls):",
@@ -1024,7 +1019,6 @@ AccessBridgeJavaEntryPoints::setTextContents(const jobject accessibleContext, co
10241019
*/
10251020
jobject
10261021
AccessBridgeJavaEntryPoints::getParentWithRole(const jobject accessibleContext, const wchar_t *role) {
1027-
jthrowable exception;
10281022
jobject rAccessibleContext;
10291023

10301024
PrintDebugString("[INFO]: In AccessBridgeJavaEntryPoints::getParentWithRole(%p):",
@@ -1062,7 +1056,6 @@ AccessBridgeJavaEntryPoints::getParentWithRole(const jobject accessibleContext,
10621056
*/
10631057
jobject
10641058
AccessBridgeJavaEntryPoints::getTopLevelObject(const jobject accessibleContext) {
1065-
jthrowable exception;
10661059
jobject rAccessibleContext;
10671060

10681061
PrintDebugString("[INFO]: In AccessBridgeJavaEntryPoints::getTopLevelObject(%p):",
@@ -1093,7 +1086,6 @@ AccessBridgeJavaEntryPoints::getTopLevelObject(const jobject accessibleContext)
10931086
*/
10941087
jobject
10951088
AccessBridgeJavaEntryPoints::getParentWithRoleElseRoot(const jobject accessibleContext, const wchar_t *role) {
1096-
jthrowable exception;
10971089
jobject rAccessibleContext;
10981090

10991091
PrintDebugString("[INFO]: In AccessBridgeJavaEntryPoints::getParentWithRoleElseRoot(%p):",
@@ -1131,7 +1123,6 @@ AccessBridgeJavaEntryPoints::getParentWithRoleElseRoot(const jobject accessibleC
11311123
*/
11321124
jint
11331125
AccessBridgeJavaEntryPoints::getObjectDepth(const jobject accessibleContext) {
1134-
jthrowable exception;
11351126
jint rResult;
11361127

11371128
PrintDebugString("[INFO]: In AccessBridgeJavaEntryPoints::getObjectDepth(%p):",
@@ -1158,7 +1149,6 @@ AccessBridgeJavaEntryPoints::getObjectDepth(const jobject accessibleContext) {
11581149
*/
11591150
jobject
11601151
AccessBridgeJavaEntryPoints::getActiveDescendent(const jobject accessibleContext) {
1161-
jthrowable exception;
11621152
jobject rAccessibleContext;
11631153

11641154
PrintDebugString("[INFO]: In AccessBridgeJavaEntryPoints::getActiveDescendent(%p):",
@@ -1215,7 +1205,6 @@ AccessBridgeJavaEntryPoints::getVirtualAccessibleName (
12151205

12161206
jstring js = NULL;
12171207
const wchar_t * stringBytes = NULL;
1218-
jthrowable exception = NULL;
12191208
jsize length = 0;
12201209
PrintDebugString("[INFO]: getVirtualAccessibleName called.");
12211210
if (getVirtualAccessibleNameFromContextMethod != (jmethodID) 0)
@@ -1266,7 +1255,6 @@ AccessBridgeJavaEntryPoints::getVirtualAccessibleName (
12661255
BOOL
12671256
AccessBridgeJavaEntryPoints::requestFocus(const jobject accessibleContext) {
12681257

1269-
jthrowable exception;
12701258
BOOL result = FALSE;
12711259

12721260
PrintDebugString("[INFO]: In AccessBridgeJavaEntryPoints::requestFocus(%p):",
@@ -1294,7 +1282,6 @@ AccessBridgeJavaEntryPoints::requestFocus(const jobject accessibleContext) {
12941282
BOOL
12951283
AccessBridgeJavaEntryPoints::selectTextRange(const jobject accessibleContext, int startIndex, int endIndex) {
12961284

1297-
jthrowable exception;
12981285
BOOL result = FALSE;
12991286

13001287
PrintDebugString("[INFO]: In AccessBridgeJavaEntryPoints::selectTextRange(%p start = %d end = %d):",
@@ -1362,7 +1349,6 @@ AccessBridgeJavaEntryPoints::getTextAttributesInRange(const jobject accessibleCo
13621349

13631350
jstring js;
13641351
const wchar_t *stringBytes;
1365-
jthrowable exception;
13661352
jsize length;
13671353
BOOL result = FALSE;
13681354

@@ -1429,7 +1415,6 @@ AccessBridgeJavaEntryPoints::getTextAttributesInRange(const jobject accessibleCo
14291415
int
14301416
AccessBridgeJavaEntryPoints::getVisibleChildrenCount(const jobject accessibleContext) {
14311417

1432-
jthrowable exception;
14331418
PrintDebugString("[INFO]: ##### AccessBridgeJavaEntryPoints::getVisibleChildrenCount(%p)",
14341419
accessibleContext);
14351420

@@ -1455,8 +1440,6 @@ BOOL AccessBridgeJavaEntryPoints::getVisibleChildren(const jobject accessibleCon
14551440
const int nStartIndex,
14561441
/* OUT */ VisibleChildrenInfo *visibleChildrenInfo) {
14571442

1458-
jthrowable exception;
1459-
14601443
PrintDebugString("[INFO]: ##### AccessBridgeJavaEntryPoints::getVisibleChildren(%p, startIndex = %d)",
14611444
accessibleContext, nStartIndex);
14621445

@@ -1500,7 +1483,6 @@ BOOL AccessBridgeJavaEntryPoints::getVisibleChildren(const jobject accessibleCon
15001483
BOOL
15011484
AccessBridgeJavaEntryPoints::setCaretPosition(const jobject accessibleContext, int position) {
15021485

1503-
jthrowable exception;
15041486
BOOL result = FALSE;
15051487

15061488
PrintDebugString("[INFO]: In AccessBridgeJavaEntryPoints::setCaretPostion(%p position = %d):",
@@ -1531,7 +1513,6 @@ BOOL
15311513
AccessBridgeJavaEntryPoints::getVersionInfo(AccessBridgeVersionInfo *info) {
15321514
jstring js;
15331515
const wchar_t *stringBytes;
1534-
jthrowable exception;
15351516
jsize length;
15361517

15371518
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getVersionInfo():");
@@ -1601,7 +1582,6 @@ AccessBridgeJavaEntryPoints::getVersionInfo(AccessBridgeVersionInfo *info) {
16011582
BOOL AccessBridgeJavaEntryPoints::verifyAccessibleText(jobject obj) {
16021583
JavaVM *vm;
16031584
BOOL retval;
1604-
jthrowable exception;
16051585

16061586
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::verifyAccessibleText");
16071587

@@ -1653,7 +1633,6 @@ jobject
16531633
AccessBridgeJavaEntryPoints::getAccessibleContextAt(jint x, jint y, jobject accessibleContext) {
16541634
jobject returnedAccessibleContext;
16551635
jobject globalRef;
1656-
jthrowable exception;
16571636

16581637
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getAccessibleContextAt(%d, %d, %p):",
16591638
x, y, accessibleContext);
@@ -1688,7 +1667,6 @@ jobject
16881667
AccessBridgeJavaEntryPoints::getAccessibleContextWithFocus() {
16891668
jobject returnedAccessibleContext;
16901669
jobject globalRef;
1691-
jthrowable exception;
16921670

16931671
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getAccessibleContextWithFocus()");
16941672

@@ -1724,7 +1702,6 @@ AccessBridgeJavaEntryPoints::getAccessibleContextInfo(jobject accessibleContext,
17241702
jstring js;
17251703
const wchar_t *stringBytes;
17261704
jobject returnedJobject;
1727-
jthrowable exception;
17281705
jsize length;
17291706

17301707
PrintDebugString("[INFO]: ##### Calling AccessBridgeJavaEntryPoints::getAccessibleContextInfo(%p):", accessibleContext);
@@ -2156,7 +2133,6 @@ jobject
21562133
AccessBridgeJavaEntryPoints::getAccessibleChildFromContext(jobject accessibleContext, jint childIndex) {
21572134
jobject returnedAccessibleContext;
21582135
jobject globalRef;
2159-
jthrowable exception;
21602136

21612137
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getAccessibleChildContext(%p, %d):",
21622138
accessibleContext, childIndex);
@@ -2188,7 +2164,6 @@ AccessBridgeJavaEntryPoints::getAccessibleParentFromContext(jobject accessibleCo
21882164
{
21892165
jobject returnedAccessibleContext;
21902166
jobject globalRef;
2191-
jthrowable exception;
21922167

21932168
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getAccessibleParentFromContext(%p):", accessibleContext);
21942169

@@ -2217,8 +2192,6 @@ BOOL
22172192
AccessBridgeJavaEntryPoints::getAccessibleTableInfo(jobject accessibleContext,
22182193
AccessibleTableInfo *tableInfo) {
22192194

2220-
jthrowable exception;
2221-
22222195
PrintDebugString("[INFO]: ##### Calling AccessBridgeJavaEntryPoints::getAccessibleTableInfo(%p):",
22232196
accessibleContext);
22242197

@@ -2292,8 +2265,6 @@ BOOL
22922265
AccessBridgeJavaEntryPoints::getAccessibleTableCellInfo(jobject accessibleTable, jint row, jint column,
22932266
AccessibleTableCellInfo *tableCellInfo) {
22942267

2295-
jthrowable exception;
2296-
22972268
PrintDebugString("[INFO]: ##### Calling AccessBridgeJavaEntryPoints::getAccessibleTableCellInfo(%p): row=%d, column=%d",
22982269
accessibleTable, row, column);
22992270

@@ -2373,8 +2344,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTableCellInfo(jobject accessibleTable,
23732344
BOOL
23742345
AccessBridgeJavaEntryPoints::getAccessibleTableRowHeader(jobject acParent, AccessibleTableInfo *tableInfo) {
23752346

2376-
jthrowable exception;
2377-
23782347
PrintDebugString("[INFO]: ##### Calling AccessBridgeJavaEntryPoints::getAccessibleTableRowHeader(%p):",
23792348
acParent);
23802349

@@ -2428,7 +2397,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTableRowHeader(jobject acParent, Acces
24282397

24292398
BOOL
24302399
AccessBridgeJavaEntryPoints::getAccessibleTableColumnHeader(jobject acParent, AccessibleTableInfo *tableInfo) {
2431-
jthrowable exception;
24322400

24332401
PrintDebugString("[INFO]: ##### Calling AccessBridgeJavaEntryPoints::getAccessibleTableColumnHeader(%p):",
24342402
acParent);
@@ -2485,7 +2453,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTableRowDescription(jobject acParent,
24852453

24862454
jobject returnedAccessibleContext;
24872455
jobject globalRef;
2488-
jthrowable exception;
24892456

24902457
PrintDebugString("[INFO]: ##### Calling AccessBridgeJavaEntryPoints::getAccessibleTableRowDescription(%p):",
24912458
acParent);
@@ -2513,7 +2480,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTableColumnDescription(jobject acParen
25132480

25142481
jobject returnedAccessibleContext;
25152482
jobject globalRef;
2516-
jthrowable exception;
25172483

25182484
PrintDebugString("[INFO]: ##### Calling AccessBridgeJavaEntryPoints::getAccessibleTableColumnDescription(%p):",
25192485
acParent);
@@ -2540,7 +2506,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTableColumnDescription(jobject acParen
25402506
jint
25412507
AccessBridgeJavaEntryPoints::getAccessibleTableRowSelectionCount(jobject accessibleTable) {
25422508

2543-
jthrowable exception;
25442509
jint count;
25452510

25462511
PrintDebugString("[INFO]: ##### AccessBridgeJavaEntryPoints::getAccessibleTableRowSelectionCount(%p)",
@@ -2565,7 +2530,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTableRowSelectionCount(jobject accessi
25652530

25662531
BOOL
25672532
AccessBridgeJavaEntryPoints::isAccessibleTableRowSelected(jobject accessibleTable, jint row) {
2568-
jthrowable exception;
25692533
BOOL result;
25702534

25712535
PrintDebugString("[INFO]: ##### AccessBridgeJavaEntryPoints::isAccessibleTableRowSelected(%p, %d)",
@@ -2591,7 +2555,6 @@ BOOL
25912555
AccessBridgeJavaEntryPoints::getAccessibleTableRowSelections(jobject accessibleTable, jint count,
25922556
jint *selections) {
25932557

2594-
jthrowable exception;
25952558

25962559
PrintDebugString("[INFO]: ##### AccessBridgeJavaEntryPoints::getAccessibleTableRowSelections(%p, %d %p)",
25972560
accessibleTable, count, selections);
@@ -2618,7 +2581,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTableRowSelections(jobject accessibleT
26182581
jint
26192582
AccessBridgeJavaEntryPoints::getAccessibleTableColumnSelectionCount(jobject accessibleTable) {
26202583

2621-
jthrowable exception;
26222584
jint count;
26232585

26242586
PrintDebugString("[INFO]: ##### AccessBridgeJavaEntryPoints::getAccessibleTableColumnSelectionCount(%p)",
@@ -2643,7 +2605,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTableColumnSelectionCount(jobject acce
26432605

26442606
BOOL
26452607
AccessBridgeJavaEntryPoints::isAccessibleTableColumnSelected(jobject accessibleTable, jint column) {
2646-
jthrowable exception;
26472608
BOOL result;
26482609

26492610
PrintDebugString("[INFO]: ##### AccessBridgeJavaEntryPoints::isAccessibleTableColumnSelected(%p, %d)",
@@ -2668,7 +2629,6 @@ AccessBridgeJavaEntryPoints::isAccessibleTableColumnSelected(jobject accessibleT
26682629
BOOL
26692630
AccessBridgeJavaEntryPoints::getAccessibleTableColumnSelections(jobject accessibleTable, jint count,
26702631
jint *selections) {
2671-
jthrowable exception;
26722632

26732633
PrintDebugString("[INFO]: ##### AccessBridgeJavaEntryPoints::getAccessibleTableColumnSelections(%p, %d, %p)",
26742634
accessibleTable, count, selections);
@@ -2694,7 +2654,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTableColumnSelections(jobject accessib
26942654

26952655
jint
26962656
AccessBridgeJavaEntryPoints::getAccessibleTableRow(jobject accessibleTable, jint index) {
2697-
jthrowable exception;
26982657
jint result;
26992658

27002659
PrintDebugString("[INFO]: ##### AccessBridgeJavaEntryPoints::getAccessibleTableRow(%p, index=%d)",
@@ -2718,7 +2677,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTableRow(jobject accessibleTable, jint
27182677

27192678
jint
27202679
AccessBridgeJavaEntryPoints::getAccessibleTableColumn(jobject accessibleTable, jint index) {
2721-
jthrowable exception;
27222680
jint result;
27232681

27242682
PrintDebugString("[INFO]: ##### AccessBridgeJavaEntryPoints::getAccessibleTableColumn(%p, index=%d)",
@@ -2742,7 +2700,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTableColumn(jobject accessibleTable, j
27422700

27432701
jint
27442702
AccessBridgeJavaEntryPoints::getAccessibleTableIndex(jobject accessibleTable, jint row, jint column) {
2745-
jthrowable exception;
27462703
jint result;
27472704

27482705
PrintDebugString("[INFO]: ##### AccessBridgeJavaEntryPoints::getAccessibleTableIndex(%p, row=%d, col=%d)",
@@ -2773,7 +2730,6 @@ BOOL
27732730
AccessBridgeJavaEntryPoints::getAccessibleRelationSet(jobject accessibleContext,
27742731
AccessibleRelationSetInfo *relationSet) {
27752732

2776-
jthrowable exception;
27772733
const wchar_t *stringBytes;
27782734
jsize length;
27792735

@@ -2853,7 +2809,6 @@ BOOL
28532809
AccessBridgeJavaEntryPoints::getAccessibleHypertext(jobject accessibleContext,
28542810
AccessibleHypertextInfo *hypertext) {
28552811

2856-
jthrowable exception;
28572812
const wchar_t *stringBytes;
28582813
jsize length;
28592814

@@ -2953,7 +2908,6 @@ BOOL
29532908
AccessBridgeJavaEntryPoints::activateAccessibleHyperlink(jobject accessibleContext,
29542909
jobject accessibleHyperlink) {
29552910

2956-
jthrowable exception;
29572911
BOOL returnVal;
29582912

29592913
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::activateAccessibleHyperlink(%p, %p):",
@@ -2983,7 +2937,6 @@ AccessBridgeJavaEntryPoints::getAccessibleHypertextExt(const jobject accessibleC
29832937
const jint nStartIndex,
29842938
/* OUT */ AccessibleHypertextInfo *hypertext) {
29852939

2986-
jthrowable exception;
29872940
const wchar_t *stringBytes;
29882941
jsize length;
29892942
PrintDebugString("[INFO]: ##### AccessBridgeJavaEntryPoints::getAccessibleHypertextExt(%p, %p, startIndex = %d)",
@@ -3084,8 +3037,6 @@ AccessBridgeJavaEntryPoints::getAccessibleHypertextExt(const jobject accessibleC
30843037

30853038
jint AccessBridgeJavaEntryPoints::getAccessibleHyperlinkCount(const jobject accessibleContext) {
30863039

3087-
jthrowable exception;
3088-
30893040
PrintDebugString("[INFO]: ##### AccessBridgeJavaEntryPoints::getAccessibleHyperlinkCount(%X)",
30903041
accessibleContext);
30913042

@@ -3106,8 +3057,6 @@ jint AccessBridgeJavaEntryPoints::getAccessibleHyperlinkCount(const jobject acce
31063057
jint AccessBridgeJavaEntryPoints::getAccessibleHypertextLinkIndex(const jobject hypertext,
31073058
const jint nIndex) {
31083059

3109-
jthrowable exception;
3110-
31113060
PrintDebugString("[INFO]: ##### AccessBridgeJavaEntryPoints::getAccessibleHypertextLinkIndex(%p, index = %d)",
31123061
hypertext, nIndex);
31133062

@@ -3129,7 +3078,6 @@ BOOL AccessBridgeJavaEntryPoints::getAccessibleHyperlink(jobject hypertext,
31293078
const jint index,
31303079
/* OUT */ AccessibleHyperlinkInfo *info) {
31313080

3132-
jthrowable exception;
31333081
const wchar_t *stringBytes;
31343082
jsize length;
31353083

@@ -3202,8 +3150,6 @@ BOOL AccessBridgeJavaEntryPoints::getAccessibleHyperlink(jobject hypertext,
32023150
BOOL AccessBridgeJavaEntryPoints::getAccessibleKeyBindings(jobject accessibleContext,
32033151
AccessibleKeyBindings *keyBindings) {
32043152

3205-
jthrowable exception;
3206-
32073153
PrintDebugString("[INFO]: ##### AccessBridgeJavaEntryPoints::getAccessibleKeyBindings(%p, %p)",
32083154
accessibleContext, keyBindings);
32093155

@@ -3249,7 +3195,6 @@ BOOL AccessBridgeJavaEntryPoints::getAccessibleKeyBindings(jobject accessibleCon
32493195
BOOL AccessBridgeJavaEntryPoints::getAccessibleIcons(jobject accessibleContext,
32503196
AccessibleIcons *icons) {
32513197

3252-
jthrowable exception;
32533198
const wchar_t *stringBytes;
32543199
jsize length;
32553200

@@ -3328,7 +3273,6 @@ BOOL AccessBridgeJavaEntryPoints::getAccessibleIcons(jobject accessibleContext,
33283273
BOOL AccessBridgeJavaEntryPoints::getAccessibleActions(jobject accessibleContext,
33293274
AccessibleActions *actions) {
33303275

3331-
jthrowable exception;
33323276
const wchar_t *stringBytes;
33333277
jsize length;
33343278

@@ -3388,7 +3332,6 @@ BOOL AccessBridgeJavaEntryPoints::doAccessibleActions(jobject accessibleContext,
33883332
AccessibleActionsToDo *actionsToDo,
33893333
jint *failure) {
33903334

3391-
jthrowable exception;
33923335
BOOL returnVal;
33933336

33943337
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::doAccessibleActions(%p, #actions %d %s):",
@@ -3436,7 +3379,6 @@ BOOL
34363379
AccessBridgeJavaEntryPoints::getAccessibleTextInfo(jobject accessibleContext,
34373380
AccessibleTextInfo *textInfo,
34383381
jint x, jint y) {
3439-
jthrowable exception;
34403382

34413383
// Verify the Java VM still exists and AccessibleContext is
34423384
// an instance of AccessibleText
@@ -3495,7 +3437,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTextItems(jobject accessibleContext,
34953437
AccessibleTextItemsInfo *textItems, jint index) {
34963438
jstring js;
34973439
const wchar_t *stringBytes;
3498-
jthrowable exception;
34993440
jsize length;
35003441

35013442
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getAccessibleTextItems(%p):", accessibleContext);
@@ -3607,7 +3548,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTextSelectionInfo(jobject accessibleCo
36073548
AccessibleTextSelectionInfo *selectionInfo) {
36083549
jstring js;
36093550
const wchar_t *stringBytes;
3610-
jthrowable exception;
36113551
jsize length;
36123552

36133553
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getAccessibleTextSelectionInfo(%p):",
@@ -3680,7 +3620,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTextAttributes(jobject accessibleConte
36803620
jstring js;
36813621
const wchar_t *stringBytes;
36823622
jobject AttributeSet;
3683-
jthrowable exception;
36843623
jsize length;
36853624

36863625
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getAccessibleTextAttributes(%p):", accessibleContext);
@@ -4174,8 +4113,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTextAttributes(jobject accessibleConte
41744113
BOOL
41754114
AccessBridgeJavaEntryPoints::getAccessibleTextRect(jobject accessibleContext, AccessibleTextRectInfo *rectInfo, jint index) {
41764115

4177-
jthrowable exception;
4178-
41794116
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getAccessibleTextRect(%p), index = %d",
41804117
accessibleContext, index);
41814118

@@ -4244,8 +4181,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTextRect(jobject accessibleContext, Ac
42444181
BOOL
42454182
AccessBridgeJavaEntryPoints::getCaretLocation(jobject accessibleContext, AccessibleTextRectInfo *rectInfo, jint index) {
42464183

4247-
jthrowable exception;
4248-
42494184
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getCaretLocation(%p), index = %d",
42504185
accessibleContext, index);
42514186

@@ -4311,8 +4246,6 @@ AccessBridgeJavaEntryPoints::getCaretLocation(jobject accessibleContext, Accessi
43114246
BOOL
43124247
AccessBridgeJavaEntryPoints::getAccessibleTextLineBounds(jobject accessibleContext, jint index, jint *startIndex, jint *endIndex) {
43134248

4314-
jthrowable exception;
4315-
43164249
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getAccessibleTextLineBounds(%p):", accessibleContext);
43174250

43184251
// Verify the Java VM still exists and AccessibleContext is
@@ -4353,7 +4286,6 @@ AccessBridgeJavaEntryPoints::getAccessibleTextRange(jobject accessibleContext,
43534286
jint start, jint end, wchar_t *text, short len) {
43544287
jstring js;
43554288
const wchar_t *stringBytes;
4356-
jthrowable exception;
43574289
jsize length;
43584290

43594291
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getAccessibleTextRange(%p, %d, %d, *text, %d):", accessibleContext, start, end, len);
@@ -4412,7 +4344,6 @@ BOOL
44124344
AccessBridgeJavaEntryPoints::getCurrentAccessibleValueFromContext(jobject accessibleContext, wchar_t *value, short len) {
44134345
jstring js;
44144346
const wchar_t *stringBytes;
4415-
jthrowable exception;
44164347
jsize length;
44174348

44184349
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getCurrentAccessibleValueFromContext(%p):", accessibleContext);
@@ -4453,7 +4384,6 @@ BOOL
44534384
AccessBridgeJavaEntryPoints::getMaximumAccessibleValueFromContext(jobject accessibleContext, wchar_t *value, short len) {
44544385
jstring js;
44554386
const wchar_t *stringBytes;
4456-
jthrowable exception;
44574387
jsize length;
44584388

44594389
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getMaximumAccessibleValueFromContext(%p):", accessibleContext);
@@ -4494,7 +4424,6 @@ BOOL
44944424
AccessBridgeJavaEntryPoints::getMinimumAccessibleValueFromContext(jobject accessibleContext, wchar_t *value, short len) {
44954425
jstring js;
44964426
const wchar_t *stringBytes;
4497-
jthrowable exception;
44984427
jsize length;
44994428

45004429
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getMinimumAccessibleValueFromContext(%p):", accessibleContext);
@@ -4536,7 +4465,6 @@ AccessBridgeJavaEntryPoints::getMinimumAccessibleValueFromContext(jobject access
45364465

45374466
void
45384467
AccessBridgeJavaEntryPoints::addAccessibleSelectionFromContext(jobject accessibleContext, int i) {
4539-
jthrowable exception;
45404468

45414469
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::addAccessibleSelectionFromContext(%p):", accessibleContext);
45424470

@@ -4554,7 +4482,6 @@ AccessBridgeJavaEntryPoints::addAccessibleSelectionFromContext(jobject accessibl
45544482

45554483
void
45564484
AccessBridgeJavaEntryPoints::clearAccessibleSelectionFromContext(jobject accessibleContext) {
4557-
jthrowable exception;
45584485

45594486
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::clearAccessibleSelectionFromContext(%p):", accessibleContext);
45604487

@@ -4574,7 +4501,6 @@ jobject
45744501
AccessBridgeJavaEntryPoints::getAccessibleSelectionFromContext(jobject accessibleContext, int i) {
45754502
jobject returnedAccessibleContext;
45764503
jobject globalRef;
4577-
jthrowable exception;
45784504

45794505
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getAccessibleSelectionFromContext(%p):", accessibleContext);
45804506

@@ -4600,7 +4526,6 @@ AccessBridgeJavaEntryPoints::getAccessibleSelectionFromContext(jobject accessibl
46004526
int
46014527
AccessBridgeJavaEntryPoints::getAccessibleSelectionCountFromContext(jobject accessibleContext) {
46024528
int count;
4603-
jthrowable exception;
46044529

46054530
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::getAccessibleSelectionCountFromContext(%p):", accessibleContext);
46064531

@@ -4621,7 +4546,6 @@ AccessBridgeJavaEntryPoints::getAccessibleSelectionCountFromContext(jobject acce
46214546
BOOL
46224547
AccessBridgeJavaEntryPoints::isAccessibleChildSelectedFromContext(jobject accessibleContext, int i) {
46234548
jboolean result;
4624-
jthrowable exception;
46254549

46264550
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::isAccessibleChildSelectedFromContext(%p):", accessibleContext);
46274551

@@ -4644,7 +4568,6 @@ AccessBridgeJavaEntryPoints::isAccessibleChildSelectedFromContext(jobject access
46444568

46454569
void
46464570
AccessBridgeJavaEntryPoints::removeAccessibleSelectionFromContext(jobject accessibleContext, int i) {
4647-
jthrowable exception;
46484571

46494572
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::removeAccessibleSelectionFromContext(%p):", accessibleContext);
46504573

@@ -4662,7 +4585,6 @@ AccessBridgeJavaEntryPoints::removeAccessibleSelectionFromContext(jobject access
46624585

46634586
void
46644587
AccessBridgeJavaEntryPoints::selectAllAccessibleSelectionFromContext(jobject accessibleContext) {
4665-
jthrowable exception;
46664588

46674589
PrintDebugString("[INFO]: Calling AccessBridgeJavaEntryPoints::selectAllAccessibleSelectionFromContext(%p):", accessibleContext);
46684590

@@ -4683,7 +4605,6 @@ AccessBridgeJavaEntryPoints::selectAllAccessibleSelectionFromContext(jobject acc
46834605

46844606
BOOL
46854607
AccessBridgeJavaEntryPoints::addJavaEventNotification(jlong type) {
4686-
jthrowable exception;
46874608

46884609
PrintDebugString("[INFO]: in AccessBridgeJavaEntryPoints::addJavaEventNotification(%016I64X);", type);
46894610

@@ -4701,7 +4622,6 @@ AccessBridgeJavaEntryPoints::addJavaEventNotification(jlong type) {
47014622

47024623
BOOL
47034624
AccessBridgeJavaEntryPoints::removeJavaEventNotification(jlong type) {
4704-
jthrowable exception;
47054625

47064626
PrintDebugString("[INFO]: in AccessBridgeJavaEntryPoints::removeJavaEventNotification(%016I64X):", type);
47074627

@@ -4719,7 +4639,6 @@ AccessBridgeJavaEntryPoints::removeJavaEventNotification(jlong type) {
47194639

47204640
BOOL
47214641
AccessBridgeJavaEntryPoints::addAccessibilityEventNotification(jlong type) {
4722-
jthrowable exception;
47234642

47244643
PrintDebugString("[INFO]: in AccessBridgeJavaEntryPoints::addAccessibilityEventNotification(%016I64X);", type);
47254644

@@ -4739,7 +4658,6 @@ AccessBridgeJavaEntryPoints::addAccessibilityEventNotification(jlong type) {
47394658

47404659
BOOL
47414660
AccessBridgeJavaEntryPoints::removeAccessibilityEventNotification(jlong type) {
4742-
jthrowable exception;
47434661

47444662
PrintDebugString("[INFO]: in AccessBridgeJavaEntryPoints::removeAccessibilityEventNotification(%016I64X):", type);
47454663

@@ -4753,4 +4671,4 @@ AccessBridgeJavaEntryPoints::removeAccessibilityEventNotification(jlong type) {
47534671
return FALSE;
47544672
}
47554673
return TRUE;
4756-
}
4674+
}

1 commit comments

Comments
 (1)

openjdk-notifier[bot] commented on Nov 19, 2024

@openjdk-notifier[bot]
openjdk-notifier[bot]
on Nov 19, 2024

Review

Issues

Please sign in to comment.