瀏覽代碼

SEC-572: Permit null parent for an AclImpl.

Ben Alex 17 年之前
父節點
當前提交
9e9b69ec8f
共有 1 個文件被更改,包括 1 次插入2 次删除
  1. 1 2
      acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java

+ 1 - 2
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;
     }