Index: topia2/src/java/org/codelutin/topia/persistence/TopiaEntityAbstract.java
diff -u topia2/src/java/org/codelutin/topia/persistence/TopiaEntityAbstract.java:1.8 topia2/src/java/org/codelutin/topia/persistence/TopiaEntityAbstract.java:1.9
--- topia2/src/java/org/codelutin/topia/persistence/TopiaEntityAbstract.java:1.8	Mon Mar 13 13:29:08 2006
+++ topia2/src/java/org/codelutin/topia/persistence/TopiaEntityAbstract.java	Wed Aug 30 14:59:04 2006
@@ -23,9 +23,9 @@
  * 
  * @author poussin
  * 
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  * 
- * Last update: $Date: 2006/03/13 13:29:08 $ by : $Author: bpoussin $
+ * Last update: $Date: 2006/08/30 14:59:04 $ by : $Author: bpoussin $
  */
 
 package org.codelutin.topia.persistence;
@@ -59,6 +59,8 @@
     transient protected PropertyChangeSupport propertyChangeSupport = 
         new PropertyChangeSupport(this);
 
+    transient private boolean inPreloaded = false;
+
     /** 
      * Call after entity creation, getTopiaContext return non null context
      * This method is called after dao.create()
@@ -196,8 +198,23 @@
         return getTopiaId().equals(other.getTopiaId());
     }
 
+    
+    /**
+     * @return the inPreloaded
+     */
+    public boolean isInPreloaded() {
+        return this.inPreloaded;
+    }
+    
+    public void setInPreLoaded(boolean v) {
+        inPreloaded = v;
+    }
+    
     protected void fireOnModifyProperty(
             String propertyName, Object oldValue, Object newValue) {
+        if (isInPreloaded()) {
+            return;
+        }
         propertyChangeSupport.firePropertyChange(
                 propertyName, oldValue, newValue);
         if (topiaContext != null) {
@@ -209,6 +226,9 @@
 
     protected void fireOnModifyIndexedProperty(
             String propertyName, int index, Object oldValue, Object newValue) {
+        if (isInPreloaded()) {
+            return;
+        }
         propertyChangeSupport.fireIndexedPropertyChange(
                 propertyName, index, oldValue, newValue);
         if (topiaContext != null) {