From 9e9b69ec8f60cdbb5928de07280f3a8c3cfcce1f Mon Sep 17 00:00:00 2001
From: Ben Alex <ben.alex@springsource.com>
Date: Sat, 5 Apr 2008 08:16:19 +0000
Subject: [PATCH] SEC-572: Permit null parent for an AclImpl.

---
 .../java/org/springframework/security/acls/domain/AclImpl.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java
index 4f44831380..7666576bc2 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java
@@ -335,8 +335,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
 
     public void setParent(Acl newParent) {
         aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
-        Assert.notNull(newParent, "New Parent required");
-        Assert.isTrue(!newParent.equals(this), "Cannot be the parent of yourself");
+        Assert.isTrue(newParent == null || !newParent.equals(this), "Cannot be the parent of yourself");
         this.parentAcl = newParent;
     }