未验证 提交 fdfcbc3c 编写于 作者: T Tim Jacomb 提交者: GitHub

Merge pull request #4508 from res0nance/spotbugs-version

[JENKINS-36720] Spotbugs fix possible NPE
......@@ -24,6 +24,7 @@
package jenkins.telemetry.impl;
import hudson.Extension;
import hudson.util.VersionNumber;
import jenkins.model.Jenkins;
import jenkins.telemetry.Telemetry;
import jenkins.util.SystemProperties;
......@@ -97,7 +98,8 @@ public class SecuritySystemProperties extends Telemetry {
putStringInfo(security, "hudson.security.HudsonPrivateSecurityRealm.ID_REGEX");
Map<String, Object> info = new TreeMap<>();
info.put("core", Jenkins.getVersion().toString());
VersionNumber jenkinsVersion = Jenkins.getVersion();
info.put("core", jenkinsVersion != null ? jenkinsVersion.toString() : "UNKNOWN");
info.put("clientDate", clientDateString());
info.put("properties", security);
......
......@@ -26,6 +26,7 @@ package jenkins.telemetry.impl.java11;
import com.google.common.annotations.VisibleForTesting;
import hudson.Extension;
import hudson.util.VersionNumber;
import io.jenkins.lib.versionnumber.JavaSpecificationVersion;
import jenkins.model.Jenkins;
import jenkins.telemetry.Telemetry;
......@@ -160,7 +161,8 @@ public class MissingClassTelemetry extends Telemetry {
}
JSONObject info = new JSONObject();
info.put("core", Jenkins.getVersion() != null ? Jenkins.getVersion().toString() : "UNKNOWN");
VersionNumber jenkinsVersion = Jenkins.getVersion();
info.put("core", jenkinsVersion != null ? jenkinsVersion.toString() : "UNKNOWN");
info.put("clientDate", clientDateString());
info.put("classMissingEvents", events);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册