From 625efa47820b72e0b6e64eb39ae342f9dc1e89d1 Mon Sep 17 00:00:00 2001
From: Matthew Porter <neoflux@users.sourceforge.net>
Date: Sun, 10 Apr 2005 21:10:03 +0000
Subject: [PATCH] Check to ensure the child object returned is not null before
 adding to list of child objects to validate.

---
 .../domain/hibernate/IntrospectionManagerHibernate.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/domain/src/main/java/org/acegisecurity/domain/hibernate/IntrospectionManagerHibernate.java b/domain/src/main/java/org/acegisecurity/domain/hibernate/IntrospectionManagerHibernate.java
index 9c027a39ed..e7943a909d 100644
--- a/domain/src/main/java/org/acegisecurity/domain/hibernate/IntrospectionManagerHibernate.java
+++ b/domain/src/main/java/org/acegisecurity/domain/hibernate/IntrospectionManagerHibernate.java
@@ -122,8 +122,10 @@ public class IntrospectionManagerHibernate implements IntrospectionManager,
                     // only if a Validator is registered for that Object
                     if (this.validationRegistryManager.findValidator(
                             propertyType.getReturnedClass()) != null) {
-                        allObjects.add(classMetadata.getPropertyValue(
-                                parentObject, propertyNames[i], EntityMode.POJO));
+                        Object childObject = classMetadata.getPropertyValue(parentObject, propertyNames[i], EntityMode.POJO);
+                        if (childObject != null) {
+                            allObjects.add(childObject);
+                        }
                     }
                 }
             }