Skip to content

Commit 76541b0

Browse files
committed
8341792: Fix ExceptionOccurred in java.security.jgss
Reviewed-by: jlu, mullan
1 parent 6fad6af commit 76541b0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void _SCDynamicStoreCallBack(SCDynamicStoreRef store, CFArrayRef changedKeys, vo
5151
jmethodID jm_Config_refresh = (*env)->GetStaticMethodID(env, jc_Config, "refresh", "()V");
5252
CHECK_NULL(jm_Config_refresh);
5353
(*env)->CallStaticVoidMethod(env, jc_Config, jm_Config_refresh);
54-
if ((*env)->ExceptionOccurred(env) != NULL) {
54+
if ((*env)->ExceptionCheck(env)) {
5555
(*env)->ExceptionClear(env);
5656
}
5757
if (createdFromAttach) {

src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -877,13 +877,13 @@ jobject BuildTicket(JNIEnv *env, PUCHAR encodedTicket, ULONG encodedTicketSize)
877877

878878
(*env)->SetByteArrayRegion(env, ary, (jsize) 0, encodedTicketSize,
879879
(jbyte *)encodedTicket);
880-
if ((*env)->ExceptionOccurred(env)) {
880+
if ((*env)->ExceptionCheck(env)) {
881881
(*env)->DeleteLocalRef(env, ary);
882882
return (jobject) NULL;
883883
}
884884

885885
ticket = (*env)->NewObject(env, ticketClass, ticketConstructor, ary);
886-
if ((*env)->ExceptionOccurred(env)) {
886+
if ((*env)->ExceptionCheck(env)) {
887887
(*env)->DeleteLocalRef(env, ary);
888888
return (jobject) NULL;
889889
}
@@ -993,7 +993,7 @@ jobject BuildEncryptionKey(JNIEnv *env, PKERB_CRYPTO_KEY cryptoKey) {
993993
}
994994
(*env)->SetByteArrayRegion(env, ary, (jsize) 0, cryptoKey->Length,
995995
(jbyte *)cryptoKey->Value);
996-
if ((*env)->ExceptionOccurred(env)) {
996+
if ((*env)->ExceptionCheck(env)) {
997997
(*env)->DeleteLocalRef(env, ary);
998998
} else {
999999
encryptionKey = (*env)->NewObject(env, encryptionKeyClass,
@@ -1018,7 +1018,7 @@ jobject BuildTicketFlags(JNIEnv *env, PULONG flags) {
10181018
}
10191019
(*env)->SetByteArrayRegion(env, ary, (jsize) 0, sizeof(*flags),
10201020
(jbyte *)&nlflags);
1021-
if ((*env)->ExceptionOccurred(env)) {
1021+
if ((*env)->ExceptionCheck(env)) {
10221022
(*env)->DeleteLocalRef(env, ary);
10231023
} else {
10241024
ticketFlags = (*env)->NewObject(env, ticketFlagsClass,

0 commit comments

Comments
 (0)