root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Avoid warning about `labelAtomSet` during `Slave.readResolve` (#10863)
Changelog Drafter / update_draft_release (push) Has been cancelled Details
Changelog Drafter / jenkins_io_draft (push) Has been cancelled Details
Label conflicting PRs / main (push) Has been cancelled Details
Run update-since-todo.py / since_updater (push) Has been cancelled Details

This commit is contained in:
Kris Stern 2025-07-23 13:41:03 +08:00 committed by GitHub
parent 2a27e84ee5 e19186bf16
commit de9058e8f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/hudson/model/Slave.java
View File

@ -27,6 +27,7 @@ package hudson.model;
import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.DescriptorExtensionList; import hudson.DescriptorExtensionList;
import hudson.EnvVars; import hudson.EnvVars;
import hudson.FilePath; import hudson.FilePath;
@ -102,6 +103,7 @@ import org.kohsuke.stapler.StaplerResponse2;
* *
* @author Kohsuke Kawaguchi * @author Kohsuke Kawaguchi
*/ */
@SuppressFBWarnings(value = "DESERIALIZATION_GADGET", justification = "unhappy about existence of readResolve?")
public abstract class Slave extends Node implements Serializable { public abstract class Slave extends Node implements Serializable {
private static final Logger LOGGER = Logger.getLogger(Slave.class.getName()); private static final Logger LOGGER = Logger.getLogger(Slave.class.getName());
@ -381,7 +383,9 @@ public abstract class Slave extends Node implements Serializable {
@Override @Override
protected Set<LabelAtom> getLabelAtomSet() { protected Set<LabelAtom> getLabelAtomSet() {
if (labelAtomSet == null) { if (labelAtomSet == null) {
warnPlugin(); if (!insideReadResolve.get()) {
warnPlugin();
}
this.labelAtomSet = Collections.unmodifiableSet(Label.parse(label)); this.labelAtomSet = Collections.unmodifiableSet(Label.parse(label));
} }
return labelAtomSet; return labelAtomSet;
@ -627,6 +631,8 @@ public abstract class Slave extends Node implements Serializable {
return name.hashCode(); return name.hashCode();
} }
private static final ThreadLocal<Boolean> insideReadResolve = ThreadLocal.withInitial(() -> false);
/** /**
* Invoked by XStream when this object is read into memory. * Invoked by XStream when this object is read into memory.
*/ */
@ -634,7 +640,12 @@ public abstract class Slave extends Node implements Serializable {
if (nodeProperties == null) if (nodeProperties == null)
nodeProperties = new DescribableList<>(this); nodeProperties = new DescribableList<>(this);
previouslyAssignedLabels = new HashSet<>(); previouslyAssignedLabels = new HashSet<>();
_setLabelString(label); insideReadResolve.set(true);
try {
_setLabelString(label);
} finally {
insideReadResolve.set(false);
}
return this; return this;
} }