Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert fabric8 bump, work around 3.6 api svr issue #174

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down