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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Issue #4985 - fix NPE related to use of Attributes.Wrapper getAttributeNameSet() #5004

Merged
merged 3 commits into from
Jul 6, 2020
Merged

Issue #4985 - fix NPE related to use of Attributes.Wrapper getAttributeNameSet() #5004

merged 3 commits into from
Jul 6, 2020

Conversation

lachlan-roberts
Copy link
Contributor

Issue #4985

This PR tries to prevent any of the Attributes.Wrapper implementations from returning a value in getAttributeNameSet() that corresponds to a null attribute when getAttribute() is called with the name.

For each Attributes.Wrapper we now do the following:

  • Ensure that if the value is set to null, we do not add the corresponding attribute name to the set.
  • Don't determine attribute values lazily as we won't know whether its null or not.
  • Ensure that any conflicting attributes from the wrapped Attributes are removed.

@mpetzold has tested this branch and it seems to have fixed the NPE originally reported
see #4985 (comment)

The NPE is gone. However, I still have a problem with the WebSocket connection of Vaadin / Atmosphere. This may be something else or related configuration.

@lachlan-roberts
Issue #4985 - ensure every attribute in getAttributeNameSet has a non…
693312a 
… null value

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
gregw
gregw approved these changes Jul 1, 2020
View reviewed changes
Copy link
Contributor

@gregw gregw left a comment

Choose a reason for hiding this comment

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

LGTM but you can remove the TODO before merging

jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java Outdated Show resolved Hide resolved
@lachlan-roberts
Issue #4985 - remove TODO in Dispatcher
f35d6cf 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
@lachlan-roberts lachlan-roberts merged commit 9a56301 into jetty-9.4.x Jul 6, 2020
@lachlan-roberts lachlan-roberts deleted the jetty-9.4.x-4985-AttributeNameSet branch July 6, 2020 01:34
@lachlan-roberts lachlan-roberts mentioned this pull request Jul 15, 2020
Merged
@joakime joakime added the Bug For general bugs on Jetty side label Jul 23, 2020
@sbordet sbordet mentioned this pull request May 20, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gregw gregw gregw approved these changes

@joakime joakime Awaiting requested review from joakime

Assignees
No one assigned
Labels
Bug For general bugs on Jetty side
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lachlan-roberts @gregw @joakime