From a9c274308d4d8af97cd8d320fae8fc68e0a3e46f Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Wed, 1 Mar 2017 18:29:16 +0100 Subject: SONAR-8783 Improve display of error when uploading scanner report --- .../src/main/java/org/sonar/scanner/report/ReportPublisher.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sonar-scanner-engine') diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java index c06f344c8ab..7255cd82f62 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/ReportPublisher.java @@ -200,6 +200,7 @@ public class ReportPublisher implements Startable { } else { String publicUrl = server.getPublicRootUrl(); HttpUrl httpUrl = HttpUrl.parse(publicUrl); + String serverVersion = (server.getVersion() != null) ? server.getVersion() : ""; Map metadata = new LinkedHashMap<>(); String effectiveKey = projectReactor.getRoot().getKeyWithBranch(); @@ -208,7 +209,7 @@ public class ReportPublisher implements Startable { } metadata.put("projectKey", effectiveKey); metadata.put("serverUrl", publicUrl); - metadata.put("serverVersion", server.getVersion()); + metadata.put("serverVersion", serverVersion); URL dashboardUrl = httpUrl.newBuilder() .addPathSegment("dashboard").addPathSegment("index").addPathSegment(effectiveKey) -- cgit v1.2.3