Merge pull request #611 from jglick/AgentsConfigFile

NPE in `AgentsConfigFile.addContents`
jenkinsci · Jan 20, 2025 · 77f9dac · 77f9dac
2 parents 4dd2021 + 1e19d1b
commit 77f9dac
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/support/configfiles/AgentsConfigFile.java b/src/main/java/com/cloudbees/jenkins/support/configfiles/AgentsConfigFile.java
@@ -34,7 +34,6 @@
 import java.io.File;
 import java.text.MessageFormat;
 import java.util.Collections;
-import java.util.Objects;
 import java.util.Set;
 import jenkins.model.Jenkins;
 import org.jenkinsci.Symbol;
@@ -84,7 +83,12 @@ public String getDisplayName() {
 
     @Override
     public void addContents(@NonNull Container container) {
-        Jenkins.get().getNodes().forEach(node -> addContents(container, Objects.requireNonNull(node.toComputer())));
+        for (var n : Jenkins.get().getNodes()) {
+            var c = n.toComputer();
+            if (c != null) {
+                addContents(container, c);
+            }
+        }
     }
 
     @Override
@@ -105,7 +109,7 @@ public <C extends AbstractModelObject> boolean isApplicable(Class<C> clazz) {
 
     @Override
     public boolean isApplicable(Computer item) {
-        return item != Jenkins.get().toComputer();
+        return !(item instanceof Jenkins.MasterComputer);
     }
 
     @Override