[jdk17u-dev] RFR: 8285397: JNI exception pending in CUPSfuncs.c:250 [v2]

[Alexander Scherbatiy]

On Fri, 20 May 2022 17:25:47 GMT, Alexander Scherbatiy <alexsch at openjdk.org> wrote:

>> This is a pull request which depends on #405 and  fixes some pending JNI exceptions in native code for JDK-8181571 fix.
>> 
>> Manual test from the JDK-8181571 works with both fixes JDK-8181571 and JDK-8285397 when running within the macOS sandbox. 
>> 
>> The tests jdk-tier1, jdk-tier2, and jdk-tier3 automated tests have been run on Mac M1.
>> The only failed test on my system is tools/jlink/JLinkTest.java.JLinkTest which fails without the fix as well.
>
> Alexander Scherbatiy has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase.

Following the instructions

git checkout JDK-8285397
git fetch https://git.openjdk.java.net/jdk17u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push


I get the same merge conflict

    for (i = 0; i < num_dests; i++) {
            utf_str = JNU_NewStringPlatform(env, dests[i].name);
            if (utf_str == NULL) {
<<<<<<< JDK-8285397
                (*env)->ExceptionClear(env);
=======
>>>>>>> master
                for (j = i - 1; j >= 0; j--) {

As the [pull/409/conflicts](https://github.com/openjdk/jdk17u-dev/pull/409/conflicts) shows.

The another approach would be just make `git rebase` from JDK-8285397 branch which puts the current fix on top of of the master branch without conflicts.

Could I use `git rebase` to make the JDK-8285397 sync with the upstream master?

-------------

PR: https://git.openjdk.java.net/jdk17u-dev/pull/409