RFR: 8089398: [ChoiceBox, ComboBox] throws NPE on setting value on null selectionModel [v6]

Ajit Ghaisas aghaisas at openjdk.java.net
Wed Sep 8 13:49:10 UTC 2021


On Wed, 8 Sep 2021 12:20:57 GMT, Kevin Rushforth <kcr at openjdk.org> wrote:

> > The latest patch does not apply cleanly due to the change in copyright headers.
> 
> @aghaisas If you fetch the PR branch and merge master (which is what I usually do when testing a PR), git is able to auto-resolve it; this is why Skara didn't flag this PR as having a merge conflict (which it will if there is).

Hmm.. interesting.
I updated my master branch and then tried to apply this PR diff manually. The patch did not apply and hence I commented the same.
I do see that Skara did not flag the merge conflict for this PR.

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

PR: https://git.openjdk.java.net/jfx/pull/557


More information about the openjfx-dev mailing list