From 2f70b2fe8b3baa1cd7e9e0cf2e2cbfbf3ddddd1d Mon Sep 17 00:00:00 2001 From: Stephen Connolly Date: Tue, 8 Mar 2016 10:20:44 +0000 Subject: [PATCH] Jenkins.getInstance() is safe to assume non-null - Only ever called after extensions are on the classpath and before termination --- .../main/java/hudson/diagnosis/NullIdDescriptorMonitor.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java b/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java index 3e2b2c428d..8892fb1f2a 100644 --- a/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java +++ b/core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java @@ -61,10 +61,7 @@ public class NullIdDescriptorMonitor extends AdministrativeMonitor { } private void verify() { - Jenkins h = Jenkins.getInstanceOrNull(); - if (h == null) { - return; - } + Jenkins h = Jenkins.getInstance(); for (Descriptor d : h.getExtensionList(Descriptor.class)) { PluginWrapper p = h.getPluginManager().whichPlugin(d.getClass()); String id;