diff options
| author | valerijf <valerijf@yahoo-inc.com> | 2017-04-04 09:13:44 +0200 |
|---|---|---|
| committer | valerijf <valerijf@yahoo-inc.com> | 2017-04-04 09:13:44 +0200 |
| commit | 0a874237ed5be92de9a817a88b5f135fe418e663 (patch) | |
| tree | fc2f22ba2abf9fefffe3cc5d747aaaf8d0ff2cd1 /node-repository | |
| parent | 9324ed4c54f70a0ec5223a1c2d6add90dcddff7e (diff) | |
Use Version toFullString()
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java index a7b7f362df3..5822175572f 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java @@ -1,6 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.restapi.v2; +import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterMembership; import com.yahoo.config.provision.NodeType; @@ -161,9 +162,9 @@ class NodesResponse extends HttpResponse { object.setLong("rebootGeneration", node.status().reboot().wanted()); object.setLong("currentRebootGeneration", node.status().reboot().current()); node.status().vespaVersion().ifPresent(version -> { - if (! version.toString().isEmpty()) object.setString("vespaVersion", version.toFullString()); + if (! version.equals(Version.emptyVersion)) object.setString("vespaVersion", version.toFullString()); }); - node.status().hostedVersion().ifPresent(version -> object.setString("hostedVersion", version.toString())); + node.status().hostedVersion().ifPresent(version -> object.setString("hostedVersion", version.toFullString())); node.status().dockerImage().ifPresent(image -> object.setString("currentDockerImage", image)); node.status().stateVersion().ifPresent(version -> object.setString("convergedStateVersion", version)); object.setLong("failCount", node.status().failCount()); |