NPE from KubernetesSlave.getKubernetesCloud

jglick · jglick · commit 6d47bd62e012 · 2023-01-06T16:16:37.000-05:00
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesSlave.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesSlave.java
@@ -233,6 +233,8 @@ private static KubernetesCloud getKubernetesCloud(String cloudName) {
         Cloud cloud = Jenkins.get().getCloud(cloudName);
         if (cloud instanceof KubernetesCloud) {
             return (KubernetesCloud) cloud;
+        } else if (cloud == null) {
+            throw new IllegalStateException("No such cloud " + cloudName);
         } else {
             throw new IllegalStateException(KubernetesSlave.class.getName() + " can be launched only by instances of " + KubernetesCloud.class.getName() + ". Cloud is " + cloud.getClass().getName());
         }

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,8 @@ private static KubernetesCloud getKubernetesCloud(String cloudName) {`
`233`	`233`	`Cloud cloud = Jenkins.get().getCloud(cloudName);`
`234`	`234`	`if (cloud instanceof KubernetesCloud) {`
`235`	`235`	`return (KubernetesCloud) cloud;`
	`236`	`+ } else if (cloud == null) {`
	`237`	`+ throw new IllegalStateException("No such cloud " + cloudName);`
`236`	`238`	`} else {`
`237`	`239`	`throw new IllegalStateException(KubernetesSlave.class.getName() + " can be launched only by instances of " + KubernetesCloud.class.getName() + ". Cloud is " + cloud.getClass().getName());`
`238`	`240`	`}`