Merge pull request #174 from gabemontero/work-around-3.6-api-issue

Merged by openshift-bot

Author: OpenShift Bot

pom.xml

@@ -42,7 +42,7 @@
          ~ hpi-plugin.version: The HPI Maven Plugin version used by the plugin..
          ~ stapler-plugin.version: The Stapler Maven plugin version required by the plugin.
     -->
-    <openshift-client.version>2.6.2</openshift-client.version>
+    <openshift-client.version>2.3.1</openshift-client.version>
     <log.level>INFO</log.level>
     <findbugs-maven-plugin.version>3.0.1</findbugs-maven-plugin.version>
     <findbugs.failOnError>false</findbugs.failOnError>

src/main/java/io/fabric8/jenkins/openshiftsync/BuildConfigWatcher.java

@@ -115,6 +115,8 @@ public synchronized void start() {
     }
 
     private synchronized void onInitialBuildConfigs(BuildConfigList buildConfigs) {
+        if (buildConfigs == null)
+            return;
         List<BuildConfig> items = buildConfigs.getItems();
         if (items != null) {
             for (BuildConfig buildConfig : items) {

src/main/java/io/fabric8/jenkins/openshiftsync/BuildWatcher.java

@@ -151,6 +151,8 @@ public synchronized void eventReceived(Action action, Build build) {
     }
 
     public synchronized static void onInitialBuilds(BuildList buildList) {
+        if (buildList == null)
+            return;
         List<Build> items = buildList.getItems();
         if (items != null) {
 

src/main/java/io/fabric8/jenkins/openshiftsync/ConfigMapWatcher.java

@@ -177,6 +177,8 @@ public void eventReceived(Action action, ConfigMap configMap) {
     }
 
     private synchronized void onInitialConfigMaps(ConfigMapList configMaps) {
+        if (configMaps == null)
+            return;
         if (trackedConfigMaps == null) {
             trackedConfigMaps = new ConcurrentHashMap<>(configMaps.getItems()
                     .size());

src/main/java/io/fabric8/jenkins/openshiftsync/ImageStreamWatcher.java

@@ -204,6 +204,8 @@ public void eventReceived(Action action, ImageStream imageStream) {
     }
 
     private synchronized void onInitialImageStream(ImageStreamList imageStreams) {
+        if (imageStreams == null)
+            return;
         List<ImageStream> items = imageStreams.getItems();
         if (items != null) {
             for (ImageStream imageStream : items) {