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 #9947 - check that each selector inside of _selectors isn't null before calculating #totalKeys #9962

Merged
merged 3 commits into from
Jun 25, 2023
Merged

Issue #9947 - check that each selector inside of _selectors isn't null before calculating #totalKeys #9962

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7661a24
Issue #9947 - check that SelectorManager has not null _selectors befo…
strogiyotec Jun 24, 2023
ca5a76f
Issue #9947 check if selecto isn't null before calculating #totalKeys
strogiyotec Jun 24, 2023
c25125b
Issue #9947 Fix formatting
strogiyotec Jun 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,13 @@ protected void execute(Runnable task)
@ManagedAttribute(value = "Total number of keys in all selectors", readonly = true)
public int getTotalKeys()
{
if (_selectors == null || _selectors.length == 0)
{
return 0;
}
int keys = 0;
for (final ManagedSelector selector : _selectors)
for (ManagedSelector selector : _selectors)
{
keys += selector.getTotalKeys();
if (selector != null)
{
Copy link
Contributor

Choose a reason for hiding this comment

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

Please drop the braces for single line statements.

Also, there is an extra new line at the end of this method, please remove that too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

keys += selector.getTotalKeys();
}
}
return keys;
}
Expand Down