From 1036074d26279ae1793dc455c8f6bdc40c68c144 Mon Sep 17 00:00:00 2001
From: Ben Alex <ben.alex@springsource.com>
Date: Sat, 5 Apr 2008 03:41:25 +0000
Subject: [PATCH] More robust null handling in equals(Object) method.

---
 .../security/acls/domain/AccessControlEntryImpl.java          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java
index 85624007a1..9adb58dde3 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java
@@ -67,6 +67,10 @@ public class AccessControlEntryImpl implements AccessControlEntry, AuditableAcce
 
         AccessControlEntryImpl rhs = (AccessControlEntryImpl) arg0;
 
+        if (this.acl == null && rhs.getAcl() != null) {
+        	return false;
+        }
+        
         if ((this.auditFailure != rhs.isAuditFailure()) || (this.auditSuccess != rhs.isAuditSuccess())
             || (this.granting != rhs.isGranting()) || !this.acl.equals(rhs.getAcl()) || !this.id.equals(rhs.getId())
             || !this.permission.equals(rhs.getPermission()) || !this.sid.equals(rhs.getSid())) {