From e79a28875f8dee4e7ade10a79bc2ed6ace3513dc Mon Sep 17 00:00:00 2001
From: Ben Alex <ben.alex@springsource.com>
Date: Sun, 26 Nov 2006 03:24:11 +0000
Subject: [PATCH] SEC-400: Clarify exception if getter returns null.

---
 .../acegisecurity/acls/objectidentity/ObjectIdentityImpl.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentityImpl.java b/core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentityImpl.java
index fe3a309a24..5098aab5a5 100644
--- a/core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentityImpl.java
+++ b/core/src/main/java/org/acegisecurity/acls/objectidentity/ObjectIdentityImpl.java
@@ -83,6 +83,7 @@ public class ObjectIdentityImpl implements ObjectIdentity {
             throw new IdentityUnavailableException("Could not extract identity from object " + object, e);
         }
 
+        Assert.notNull(result, "getId() is required to return a non-null value");
         Assert.isInstanceOf(Serializable.class, result, "Getter must provide a return value of type Serializable");
         this.identifier = (Serializable) result;
     }