From 83a102eea43c3e739bfa482de63a82ff43a66287 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 25 Feb 2009 00:10:19 +0000 Subject: [PATCH] fixed NPE in GlobalMatrixAuthorizationStrategy. This is caused by having Permission objects whose PermissionGroup is defined in another class. In such a case, Permission.fromId() fails to load the right class. Caused by: java.lang.NullPointerException at hudson.security.GlobalMatrixAuthorizationStrategy$ConverterImpl.marshal(GlobalMatrixAuthorizationStrategy.java:171) at hudson.util.XStream2$AssociatedConverterImpl.marshal(XStream2.java:137) at com.thoughtworks.xstream.core.AbstractReferenceMarshaller.convert(AbstractReferenceMarshaller.java:65) at com.thoughtworks.xstream.core.TreeMarshaller.convertAnother(TreeMarshaller.java:78) at com.thoughtworks.xstream.core.TreeMarshaller.convertAnother(TreeMarshaller.java:63) at hudson.util.RobustReflectionConverter.marshallField(RobustReflectionConverter.java:168) at hudson.util.RobustReflectionConverter$2.writeField(RobustReflectionConverter.java:156) ... 27 more git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@15700 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/AbstractProject.java | 2 -- core/src/main/java/hudson/model/Item.java | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 64c72595d2..d3525f88b4 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -1315,8 +1315,6 @@ public abstract class AbstractProject

,R extends A private static final Logger LOGGER = Logger.getLogger(AbstractProject.class.getName()); - public static final Permission BUILD = new Permission(PERMISSIONS, "Build", Messages._AbstractProject_BuildPermission_Description(), Permission.UPDATE); - public static final Permission WORKSPACE = new Permission(PERMISSIONS, "Workspace", Messages._AbstractProject_WorkspacePermission_Description(), Permission.READ); /** * Permission to abort a build. For now, let's make it the same as {@link #BUILD} */ diff --git a/core/src/main/java/hudson/model/Item.java b/core/src/main/java/hudson/model/Item.java index 40cdb8f1b7..46e2c3cce9 100644 --- a/core/src/main/java/hudson/model/Item.java +++ b/core/src/main/java/hudson/model/Item.java @@ -190,4 +190,6 @@ public interface Item extends PersistenceRoot, SearchableModelObject, AccessCont public static final Permission CREATE = new Permission(PERMISSIONS,"Create", Permission.CREATE); public static final Permission DELETE = new Permission(PERMISSIONS,"Delete", Permission.DELETE); public static final Permission CONFIGURE = new Permission(PERMISSIONS,"Configure", Permission.CONFIGURE); + public static final Permission BUILD = new Permission(PERMISSIONS, "Build", Messages._AbstractProject_BuildPermission_Description(), Permission.UPDATE); + public static final Permission WORKSPACE = new Permission(PERMISSIONS, "Workspace", Messages._AbstractProject_WorkspacePermission_Description(), Permission.READ); }