Skip to content

Fix NullPointerException in LazyBuildMixIn on jenkins reload#26399

Merged
timja merged 1 commit intojenkinsci:masterfrom
dukhlov:npe-fix
Mar 4, 2026
Merged

Fix NullPointerException in LazyBuildMixIn on jenkins reload#26399
timja merged 1 commit intojenkinsci:masterfrom
dukhlov:npe-fix

Conversation

@dukhlov
Copy link
Contributor

@dukhlov dukhlov commented Mar 3, 2026

Fixes #26397

This PR removes the lazy loading behavior of RunMap’s entry.getValue(). The value will now be resolved inside iterator.next() instead of in entry.getValue() itself.

The weak semantics will be preserved for keySet() iteration, allowing iteration without resolving values on each step. Values can still be resolved explicitly by calling RunMap.get(someKey).

Testing done

Only jenkins integration tests. It is hard to reproduce the issue

Screenshots (UI changes only)

Before

After

Proposed changelog entries

  • Partially revert optimisation in RunMap that causes issues when reloading

Proposed changelog category

/label regression-fix

Proposed upgrade guidelines

N/A

Submitter checklist

  • The issue, if it exists, is well-described.
  • The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples). Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
  • There is automated testing or an explanation as to why this change has no tests.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
  • UI changes do not introduce regressions when enforcing the current default rules of Content Security Policy Plugin. In particular, new or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
  • For dependency updates, there are links to external changelogs and, if possible, full differentials.
  • For new APIs and extension points, there is a link to at least one consumer.

Desired reviewers

@jglick

Before the changes are marked as ready-for-merge:

Maintainer checklist

  • There are at least two (2) approvals for the pull request and no outstanding requests for change.
  • Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
  • Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
  • Proper changelog labels are set so that the changelog can be generated automatically.
  • If the change needs additional upgrade steps from users, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see example).
  • If it would make sense to backport the change to LTS, be a Bug or Improvement, and either the issue or pull request must be labeled as lts-candidate to be considered.

@comment-ops-bot comment-ops-bot bot added the regression-fix Pull request that fixes a regression in one of the previous Jenkins releases label Mar 3, 2026
Copy link
Member

@timja timja left a comment

Choose a reason for hiding this comment

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

Thanks for sorting so quickly. I've tweaked the changelog entry a bit, not entirely happy with but I think its better than before.

@timja timja requested a review from jglick March 3, 2026 22:20
Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

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

To be clear, is this reverting all or part of some specific prior PR?

@dukhlov
Copy link
Contributor Author

dukhlov commented Mar 3, 2026

To be clear, is this reverting all or part of some specific prior PR?

I would say that it's re-work of #11038

@timja
Copy link
Member

timja commented Mar 4, 2026

/label ready-for-merge


This PR is now ready for merge, after ~24 hours, we will merge it if there's no negative feedback.

Thanks!

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Mar 4, 2026
@sxa
Copy link

sxa commented Mar 4, 2026

Thanks for getting this fix done so quickly. I'm not too familiar with your LTS build cut-off dates but assuming it gets merged this week is it likely to make it into 2.541.3 in a couple of weeks from now?

@timja
Copy link
Member

timja commented Mar 4, 2026

see #26397 (comment)

@timja timja merged commit ef7e6e6 into jenkinsci:master Mar 4, 2026
18 checks passed
@krisstern krisstern added the bug For changelog: Minor bug. Will be listed after features label Mar 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug For changelog: Minor bug. Will be listed after features ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback regression-fix Pull request that fixes a regression in one of the previous Jenkins releases

Projects

None yet

Development

Successfully merging this pull request may close these issues.

NullPointerException in LazyBuildMixIn on jenkins reload

6 participants