From 34b5737ee77452e87b762c9e2f4e71a7b64e7ebb Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 28 Apr 2009 16:38:05 +0000 Subject: [PATCH] NPE prevents Hudson from starting up on some environments (report) git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@17574 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Hudson.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index 7e6c55bc70..8da419c315 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -246,7 +246,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl * * Never null. */ - private volatile AuthorizationStrategy authorizationStrategy; + private volatile AuthorizationStrategy authorizationStrategy = AuthorizationStrategy.UNSECURED; /** * Controls a part of the @@ -263,7 +263,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl * @see #getSecurity() * @see #setSecurityRealm(SecurityRealm) */ - private volatile SecurityRealm securityRealm; + private volatile SecurityRealm securityRealm = SecurityRealm.NO_AUTHENTICATION; /** * Message displayed in the top page. @@ -1021,13 +1021,8 @@ public final class Hudson extends Node implements ItemGroup, Stapl public List getItems() { List viewableItems = new ArrayList(); for (TopLevelItem item : items.values()) { - if (item instanceof AccessControlled) { - if (((AccessControlled)item).hasPermission(Item.READ)) - viewableItems.add(item); - } - else { - viewableItems.add(item); - } + if (item.hasPermission(Item.READ)) + viewableItems.add(item); } return viewableItems; @@ -3307,7 +3302,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl public static boolean PARALLEL_LOAD = !"false".equals(System.getProperty(Hudson.class.getName()+".parallelLoad")); public static boolean KILL_AFTER_LOAD = Boolean.getBoolean(Hudson.class.getName()+".killAfterLoad"); public static boolean LOG_STARTUP_PERFORMANCE = Boolean.getBoolean(Hudson.class.getName()+".logStartupPerformance"); - private static final boolean CONSISTENT_HASH = Boolean.getBoolean(Hudson.class.getName()+".consistentHash"); + private static final boolean CONSISTENT_HASH = true; // Boolean.getBoolean(Hudson.class.getName()+".consistentHash"); private static final Logger LOGGER = Logger.getLogger(Hudson.class.getName());