Merge pull request #12036 from vespa-engine/jvenstad/source-revision-may-not-be-present

Source revision may not be present

1 files changed, 5 insertions, 3 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
index 9ea530c7886..73cdf28c366 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
@@ -415,9 +415,11 @@ class JobControllerApiHandlerHelper {
 
         versionObject.setLong("build", version.buildNumber().getAsLong());
         Cursor sourceObject = versionObject.setObject("source");
-        sourceObject.setString("gitRepository", version.source().get().repository());
-        sourceObject.setString("gitBranch", version.source().get().branch());
-        sourceObject.setString("gitCommit", version.source().get().commit());
+        version.source().ifPresent(source -> {
+            sourceObject.setString("gitRepository", source.repository());
+            sourceObject.setString("gitBranch", source.branch());
+            sourceObject.setString("gitCommit", source.commit());
+        });
         version.sourceUrl().ifPresent(url -> versionObject.setString("sourceUrl", url));
         version.commit().ifPresent(commit -> versionObject.setString("commit", commit));
     }