fix(java/driver/jni): check for pending exceptions more thoroughly#4398
Draft
lidavidm wants to merge 1 commit into
Draft
fix(java/driver/jni): check for pending exceptions more thoroughly#4398lidavidm wants to merge 1 commit into
lidavidm wants to merge 1 commit into
Conversation
After JNI calls that can leave a pending Java exception (GetArrayLength, GetObjectArrayElement, GetIntArrayRegion, GetByteArrayRegion, NewByteArray, SetByteArrayRegion) and are followed by further JNI or native ADBC work, check env->ExceptionCheck() and return the function's existing error default, letting the pending exception propagate to Java rather than performing more work or raising a second exception. Generated-by: Claude Opus 4.8 <noreply@anthropic.com>
There was a problem hiding this comment.
Pull request overview
This PR strengthens JNI error handling in the Java JNI driver by explicitly checking for pending Java exceptions after specific JNI calls, and returning early to let the original Java exception propagate instead of continuing native work (which could trigger additional failures or secondary exceptions).
Changes:
- Added
env->ExceptionCheck()short-circuit returns after array length and element access inopenDatabaseand metadata helpers. - Added exception checks around byte-array allocation and population (
NewByteArray,SetByteArrayRegion) in*GetOptionBytespaths. - Added exception checks after reading array contents (
GetArrayLength,Get*ArrayRegion) in*SetOptionBytespaths.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
339
to
+340
| const jsize num_params = env->GetArrayLength(parameters); | ||
| if (env->ExceptionCheck()) return nullptr; |
Member
Author
There was a problem hiding this comment.
This will conflict with other changes so let's wait for other PRs first
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
After JNI calls that can leave a pending Java exception (GetArrayLength, GetObjectArrayElement, GetIntArrayRegion, GetByteArrayRegion, NewByteArray, SetByteArrayRegion) and are followed by further JNI or native ADBC work, check env->ExceptionCheck() and return the function's existing error default, letting the pending exception propagate to Java rather than performing more work or raising a second exception.
Generated-by: Claude Opus 4.8 noreply@anthropic.com