Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

8269871: CellEditEvent: must not throw NPE in accessors #611

Closed
wants to merge 2 commits into from

Conversation

kleopatra
Copy link
Collaborator

@kleopatra kleopatra commented Aug 26, 2021

The issue is unguarded access to tablePosition though it might be null (since JDK-8120610

The fix is to check against null in each accessor. Also required to fix the default onEditCommit handlers in Tree/TableColumn to really cope with null TablePostion on the event.

Added tests that failed/pass before/after the fix.

Note that there was an old test (in Tree/TableColumnTest each), that failed after the fix because it expected the NPE. Fixed by removing the expected parameter.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8269871: CellEditEvent: must not throw NPE in accessors

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx pull/611/head:pull/611
$ git checkout pull/611

Update a local copy of the PR:
$ git checkout pull/611
$ git pull https://git.openjdk.java.net/jfx pull/611/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 611

View PR using the GUI difftool:
$ git pr show -t 611

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx/pull/611.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 26, 2021

馃憢 Welcome back fastegal! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Ready for review label Aug 26, 2021
@mlbridge
Copy link

mlbridge bot commented Aug 26, 2021

Webrevs

Copy link
Member

@Maran23 Maran23 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.
Good to see this fixed, I remember I had some NPEs in the past because of a null table position. 馃槂

Copy link
Collaborator

@aghaisas aghaisas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fix looks good.

Minor : Two comments from tests need to be removed.

@openjdk
Copy link

openjdk bot commented Sep 6, 2021

@kleopatra This change now passes all automated pre-integration checks.

鈩癸笍 This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8269871: CellEditEvent: must not throw NPE in accessors

Reviewed-by: aghaisas

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 2 new commits pushed to the master branch:

  • 2267b11: 8273071: SeparatorSkin: must remove child on dispose
  • e931501: 8269081: Tree/ListViewSkin: must remove flow on dispose

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

鉃★笍 To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Ready to be integrated label Sep 6, 2021
@kleopatra
Copy link
Collaborator Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 6, 2021

Going to push as commit 78ae4a8.
Since your change was applied there have been 2 commits pushed to the master branch:

  • 2267b11: 8273071: SeparatorSkin: must remove child on dispose
  • e931501: 8269081: Tree/ListViewSkin: must remove flow on dispose

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 6, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Ready to be integrated rfr Ready for review labels Sep 6, 2021
@openjdk
Copy link

openjdk bot commented Sep 6, 2021

@kleopatra Pushed as commit 78ae4a8.

馃挕 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@kleopatra kleopatra deleted the bug-fix-8269871 branch September 6, 2021 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
3 participants