Merge pull request #89 from ikatson/fix-null-pointer-exceptions

Fix null pointer exceptions.
jenkinsci · Nov 21, 2016 · 921d44d · 921d44d
2 parents 8b1268a + 191dd66
commit 921d44d
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java
@@ -608,19 +608,22 @@ private boolean addProvisionedSlave(PodTemplate template, Label label) throws Ex
 
         KubernetesClient client = connect();
         PodList slaveList = client.pods().withLabels(POD_LABEL).list();
+        List<Pod> slaveListItems = slaveList.getItems();
+
         Map<String, String> labelsMap = getLabelsMap(template.getLabelSet());
         PodList namedList = client.pods().withLabels(labelsMap).list();
+        List<Pod> namedListItems = namedList.getItems();
 
-        if (containerCap < slaveList.getItems().size()) {
+        if (slaveListItems != null && containerCap < slaveListItems.size()) {
             LOGGER.log(Level.INFO, "Total container cap of {0} reached, not provisioning: {1} running in namespace {2}",
-                    new Object[] { containerCap, slaveList.getItems().size(), client.getNamespace() });
+                    new Object[] { containerCap, slaveListItems.size(), client.getNamespace() });
             return false;
         }
 
-        if (template.getInstanceCap() < namedList.getItems().size()) {
+        if (namedListItems != null && slaveListItems != null && template.getInstanceCap() < namedListItems.size()) {
             LOGGER.log(Level.INFO,
                     "Template instance cap of {0} reached for template {1}, not provisioning: {2} running in namespace {3} with label {4}",
-                    new Object[] { template.getInstanceCap(), template.getName(), slaveList.getItems().size(),
+                    new Object[] { template.getInstanceCap(), template.getName(), slaveListItems.size(),
                             client.getNamespace(), label.toString() });
             return false; // maxed out
         }