mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-03 07:05:55 +00:00
Jenkins.getInstance() should be non-null
- It is never too late to do the right thing. - The vast majority of usages of `Jenkins.getInstance()` in core currently assume that its return value is non-null - This commit changes those that are written to correctly check for non-null values will call `Jenkins.getInstanceOrNull()` - We deprecate the `Jenkins.getActiveInstance()` madness - I checked with @kohsuke who said not to bother with a PR and just commit this strongly opinionated change direct to master as a PR will just degrade into a bikeshedding.
This commit is contained in:
1 parent
7597c98a90
commit
bb7c8fcedb
42 files changed
+99
-78
No files matched your search
@@ -219,7 +219,7 @@ public class Functions {
|
||||
* @since 1.607
|
||||
*/
|
||||
public static boolean isExtensionsAvailable() {
|
||||
final Jenkins jenkins = Jenkins.getInstance();
|
||||
final Jenkins jenkins = Jenkins.getInstanceOrNull();
|
||||
return jenkins != null && jenkins.getInitLevel().compareTo(InitMilestone.EXTENSIONS_AUGMENTED) >= 0;
|
||||
}
|
||||
|
||||
@@ -1649,7 +1649,7 @@ public class Functions {
|
||||
*/
|
||||
public static List<PageDecorator> getPageDecorators() {
|
||||
// this method may be called to render start up errors, at which point Hudson doesn't exist yet. see HUDSON-3608
|
||||
if(Jenkins.getInstance()==null) return Collections.emptyList();
|
||||
if(Jenkins.getInstanceOrNull()==null) return Collections.emptyList();
|
||||
return PageDecorator.all();
|
||||
}
|
||||
|
||||
@@ -1671,13 +1671,13 @@ public class Functions {
|
||||
}
|
||||
|
||||
public static String getCrumb(StaplerRequest req) {
|
||||
Jenkins h = Jenkins.getInstance();
|
||||
Jenkins h = Jenkins.getInstanceOrNull();
|
||||
CrumbIssuer issuer = h != null ? h.getCrumbIssuer() : null;
|
||||
return issuer != null ? issuer.getCrumb(req) : "";
|
||||
}
|
||||
|
||||
public static String getCrumbRequestField() {
|
||||
Jenkins h = Jenkins.getInstance();
|
||||
Jenkins h = Jenkins.getInstanceOrNull();
|
||||
CrumbIssuer issuer = h != null ? h.getCrumbIssuer() : null;
|
||||
return issuer != null ? issuer.getDescriptor().getCrumbRequestField() : "";
|
||||
}
|
||||
@@ -1907,7 +1907,7 @@ public class Functions {
|
||||
* discovery of Jenkins.
|
||||
*/
|
||||
public static void advertiseHeaders(HttpServletResponse rsp) {
|
||||
Jenkins j = Jenkins.getInstance();
|
||||
Jenkins j = Jenkins.getInstanceOrNull();
|
||||
if (j!=null) {
|
||||
rsp.setHeader("X-Hudson","1.395");
|
||||
rsp.setHeader("X-Jenkins", Jenkins.VERSION);
|
||||
|
||||
Reference in new issue
Block a user