Changeset 5067

Timestamp:

Aug 20, 2009, 8:24:48 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

References #108: Logging the change history of an item

Makes it possible to find and log dirty collections.

File:

• trunk/src/core/net/sf/basedb/core/log/EntityDetails.java (modified) (5 diffs)

trunk/src/core/net/sf/basedb/core/log/EntityDetails.java

@@ -27 +27 @@
 
 import org.hibernate.EntityMode;
+import org.hibernate.collection.PersistentCollection;
 import org.hibernate.type.Type;
 import org.hibernate.type.VersionType;
@@ -54 +55 @@
   private final String[] properties;
   private final Type[] types;
+  private final int[] dirty;
   
   public EntityDetails(EntityLogger logger, Object entity, ChangeType changeType,
@@ -65 +67 @@
     this.properties = properties;
     this.types = types;
+    this.dirty = new int[types.length]; // 0 = not known, -1 = not dirty, 1 = dirty
+    findDirtyCollections();
   }
   
@@ -147 +151 @@
     for (int i = 0; i < types.length; ++i)
     {
-      Type t = types[i];
-      if (!t.isCollectionType() && !(t instanceof VersionType))
+      if (dirty[i] == 0)
       {
-        Object c = state[i];
-        Object o = previousState[i];
-        if (!t.isEqual(c, o, EntityMode.POJO))
+        Type t = types[i];
+        if (!t.isCollectionType() && !(t instanceof VersionType))
         {
-          modified.append(s).append(properties[i]);
-          s = separator;
-          numModified++;
+          Object c = state[i];
+          Object o = previousState[i];
+          dirty[i] = t.isEqual(c, o, EntityMode.POJO) ? -1 : 1;
         }
+      }
+      if (dirty[i] == 1)
+      {
+        modified.append(s).append(properties[i]);
+        s = separator;
+        numModified++;
       }
     }
@@ -200 +208 @@
     return details;
   }
+  
+  /**
+    We must do this from the constructor since the "dirtyness" of a
+    collection is reset after flush the SQL to the database, which is 
+    completed before the rest of the logging is done.
+  */
+  private void findDirtyCollections()
+  {
+    for (int i = 0; i < types.length; ++i)
+    {
+      Type t = types[i];
+      if (t.isCollectionType())
+      {
+        Object c = state[i];
+        if (c instanceof PersistentCollection)
+        {
+          dirty[i] = ((PersistentCollection)c).isDirty() ? 1 : -1;
+        }
+      }
+    }
+  }
+  
 }