Fill in gaps for NPE fix#2004
Merged
res0nance merged 1 commit intojenkinsci:res0nance-patch-2from Apr 6, 2026
Merged
Conversation
How current fix is incomplete ----------------------------- `readResolve()` has an early return this on line 540 inside the credential migration path. The `cachedTemplateSlaves` null check was placed after this early return, so any EC2Cloud instance with legacy accessId/secretKey credentials matching an existing credential would exit `readResolve()` without initializing cachedTemplateSlaves, hitting the same NPE. This change ----------- Moves the `cachedTemplateSlaves` null-check initialization to the top of `readResolve()`, immediately after `slaveCountingLock`, so it executes before any early return path. Co-authored-by: sgleske@integralads.com
6 tasks
res0nance
added a commit
that referenced
this pull request
Apr 6, 2026
* fix cachedSlaveTemplates being null This should fix issue #2002 * Fill in gaps for NPE fix (#2004) How current fix is incomplete ----------------------------- `readResolve()` has an early return this on line 540 inside the credential migration path. The `cachedTemplateSlaves` null check was placed after this early return, so any EC2Cloud instance with legacy accessId/secretKey credentials matching an existing credential would exit `readResolve()` without initializing cachedTemplateSlaves, hitting the same NPE. This change ----------- Moves the `cachedTemplateSlaves` null-check initialization to the top of `readResolve()`, immediately after `slaveCountingLock`, so it executes before any early return path. Co-authored-by: sgleske@integralads.com --------- Co-authored-by: Sam Gleske <875669+samrocketman@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
How current fix is incomplete
readResolve()has an early return this on line 540 inside the credential migration path. ThecachedTemplateSlavesnull check was placed after this early return, so any EC2Cloud instance with legacy accessId/secretKey credentials matching an existing credential would exitreadResolve()without initializing cachedTemplateSlaves, hitting the same NPE.This change
Moves the
cachedTemplateSlavesnull-check initialization to the top ofreadResolve(), immediately afterslaveCountingLock, so it executes before any early return path.