From 43d4ab0bfedd0cef6f29653ad5d01f06b7ab0ddf Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 9 Jun 2008 23:43:25 +0000 Subject: [PATCH] better code reuse. Even if it's just one lien git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@9975 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/Functions.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index bafac3fbf4..ae04dddeee 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -440,9 +440,7 @@ public class Functions { } public static void checkPermission(Permission permission) throws IOException, ServletException { - if (permission != null) { - Hudson.getInstance().getACL().checkPermission(permission); - } + checkPermission(Hudson.getInstance(),permission); } public static void checkPermission(AccessControlled object, Permission permission) throws IOException, ServletException { @@ -458,7 +456,7 @@ public class Functions { * If null, returns true. This defaulting is convenient in making the use of this method terse. */ public static boolean hasPermission(Permission permission) throws IOException, ServletException { - return permission==null || Hudson.getInstance().getACL().hasPermission(permission); + return hasPermission(Hudson.getInstance(),permission); } public static boolean hasPermission(AccessControlled object, Permission permission) throws IOException, ServletException {