From e9772f0ffd55832f500448be3e6362c7546c8b9e Mon Sep 17 00:00:00 2001
From: Stephen Connolly <stephen.alan.connolly@gmail.com>
Date: Tue, 8 Mar 2016 10:29:08 +0000
Subject: [PATCH] Jenkins.getInstance() is safe to assume non-null

- Only ever called after extensions are on the classpath while performing initialization and during termination before `Jenkins.theInstance` is set to `null`
---
 core/src/main/java/hudson/init/TaskMethodFinder.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/hudson/init/TaskMethodFinder.java b/core/src/main/java/hudson/init/TaskMethodFinder.java
index 77a083b30a..9ced2cb1ab 100644
--- a/core/src/main/java/hudson/init/TaskMethodFinder.java
+++ b/core/src/main/java/hudson/init/TaskMethodFinder.java
@@ -116,8 +116,8 @@ abstract class TaskMethodFinder<T extends Annotation> extends TaskBuilder {
      */
     private Object lookUp(Class<?> type) {
         if (type==Jenkins.class || type==Hudson.class)
-            return Jenkins.getInstanceOrNull();
-        Jenkins j = Jenkins.getInstanceOrNull();
+            return Jenkins.getInstance();
+        Jenkins j = Jenkins.getInstance();
         if (j!=null) {
             Injector i = j.getInjector();
             if (i!=null)
-- 
GitLab