Index: topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java
diff -u topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.19 topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.20
--- topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java:1.19	Wed May 24 13:22:04 2006
+++ topia2/src/java/org/codelutin/topia/generator/EntityAbstractGenerator.java	Fri Sep 22 13:24:18 2006
@@ -24,10 +24,10 @@
 * Created: 12 déc. 2005
 *
 * @author Arnaud Thimel <thimel@codelutin.com>
-* @version $Revision: 1.19 $
+* @version $Revision: 1.20 $
 *
-* Mise a jour: $Date: 2006/05/24 13:22:04 $
-* par : $Author: thimel $
+* Mise a jour: $Date: 2006/09/22 13:24:18 $
+* par : $Author: bpoussin $
 */
 
 package org.codelutin.topia.generator;
@@ -449,7 +449,7 @@
      * @see <%=clazz.getQualifiedName()%>#get<%=Util.capitalize(assocAttrName)%>(<%=attr.getType()%>)
      *)
     public <%=attr.getAssociationClass().getQualifiedName()%> get<%=Util.capitalize(assocAttrName)%>(<%=attr.getType()%> value) {
-        if (value == null) {
+        if (value == null || <%=Util.toLowerCaseFirstLetter(attr.getName())%> == null) {
             return null;
         }
         for (<%=attr.getAssociationClass().getQualifiedName()%> item : <%=Util.toLowerCaseFirstLetter(attr.getName())%>) {