Skip to content

Commit

Permalink
Cleanup getInstance() references (#107)
Browse files Browse the repository at this point in the history
* Cleanup getInstance() references

* switch out to getInstanceOrNull
  • Loading branch information
darinpope committed Mar 9, 2021
1 parent c060f77 commit 76f7d5f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/main/java/hudson/tasks/MailSender.java
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ private MimeMessage createEmptyMail(final Run<?, ?> run, final TaskListener list
// people who made a change in the upstream
String projectName = address.substring("upstream-individuals:".length());
// TODO 1.590+ Jenkins.getActiveInstance
final Jenkins jenkins = Jenkins.getInstance();
final Jenkins jenkins = Jenkins.getInstanceOrNull();
if (jenkins == null) {
listener.getLogger().println("Jenkins is not ready. Cannot retrieve project "+projectName);
continue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public MimeMessage buildMimeMessage() throws MessagingException, UnsupportedEnco
}

private void setJenkinsInstanceIdent(MimeMessage msg) throws MessagingException {
if (Jenkins.getInstance() != null) {
if (Jenkins.getInstanceOrNull() != null) {
String encodedIdentity;
try {
RSAPublicKey publicKey = InstanceIdentity.get().getPublic();
Expand Down

0 comments on commit 76f7d5f

Please sign in to comment.