From 98ab51628701d08efc64b727e807848a6a6f8a4b Mon Sep 17 00:00:00 2001
From: Jim Minter <jminter@redhat.com>
Date: Fri, 11 Nov 2016 09:39:36 +0000
Subject: [PATCH] fix NPE introduced in "Support build run policies"

---
 .../java/io/fabric8/jenkins/openshiftsync/JenkinsUtils.java  | 5 +++--
 .../io/fabric8/jenkins/openshiftsync/NewBuildWatcher.java    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/fabric8/jenkins/openshiftsync/JenkinsUtils.java b/src/main/java/io/fabric8/jenkins/openshiftsync/JenkinsUtils.java
index 9beaa9b29..c5cc395b1 100644
--- a/src/main/java/io/fabric8/jenkins/openshiftsync/JenkinsUtils.java
+++ b/src/main/java/io/fabric8/jenkins/openshiftsync/JenkinsUtils.java
@@ -84,15 +84,16 @@ public synchronized static void triggerJob(WorkflowJob job, Build build) throws
       return;
     }
 
+    WorkflowRun lastBuild = job.getLastBuild();
     switch (bcProp.getBuildRunPolicy()) {
       case SERIAL_LATEST_ONLY:
         cancelQueuedBuilds(bcProp.getUid());
-        if (job.getLastBuild().isBuilding()) {
+        if (lastBuild != null && lastBuild.isBuilding()) {
           return;
         }
         break;
       case SERIAL:
-        if (hasQueuedBuilds(bcProp.getUid()) || job.getLastBuild().isBuilding()) {
+        if (hasQueuedBuilds(bcProp.getUid()) || (lastBuild != null && lastBuild.isBuilding())) {
           return;
         }
         break;
diff --git a/src/main/java/io/fabric8/jenkins/openshiftsync/NewBuildWatcher.java b/src/main/java/io/fabric8/jenkins/openshiftsync/NewBuildWatcher.java
index b369195ee..48d3d3ad0 100644
--- a/src/main/java/io/fabric8/jenkins/openshiftsync/NewBuildWatcher.java
+++ b/src/main/java/io/fabric8/jenkins/openshiftsync/NewBuildWatcher.java
@@ -52,7 +52,7 @@ public NewBuildWatcher(String defaultNamespace) {
   public void start() {
     final BuildList builds;
     if (namespace != null && !namespace.isEmpty()) {
-      builds = getOpenShiftClient().builds().inNamespace(namespace).withField("status", BuildPhases.NEW).withField("status", BuildPhases.NEW).list();
+      builds = getOpenShiftClient().builds().inNamespace(namespace).withField("status", BuildPhases.NEW).list();
       buildsWatch = getOpenShiftClient().builds().inNamespace(namespace).withField("status", BuildPhases.NEW).withResourceVersion(builds.getMetadata().getResourceVersion()).watch(this);
     } else {
       builds = getOpenShiftClient().builds().withField("status", BuildPhases.NEW).list();