Changeset 5058

Timestamp:

Aug 18, 2009, 2:56:25 PM (14 years ago)

Author:

Nicklas Nordborg

Message:

References #108: Logging the change history of an item

• We must tell DbControll?.reattach() if the item has been updated while it was detached or not or the logging will not work as expected. NOTE!!! This is a backwards compatibility problem that needs to be documented!!!

Location:

trunk/src

Files:

• core/net/sf/basedb/core/DbControl.java (modified) (3 diffs)
• test/TestDbControl.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/DbControl.java

@@ -992 +992 @@
   
   /**
+    Reattach a detached item assuming that it has not been
+    updated while it was detached.
+    @see #reattachItem(BasicItem, boolean)
+  */
+  public void reattachItem(BasicItem item)
+    throws PermissionDeniedException, ItemNotFoundException, BaseException
+  {
+    reattachItem(item, false);
+  }
+  
+  /**
     Reattach a detached item from this <code>DbControl</code>. If the
     reattached already exists in the database it will be managed and 
@@ -997 +1008 @@
     
     @param item The item to be reattached
+    @param updated If TRUE, the item has been updated while it was detached
+      and changes will be saved to the database. If FALSE, the item will
+      only be saved to the database if it is modified after the
+      reattachement
     @throws PermissionDeniedException If the logged in user doesn't have
-      read permission
+      read/write permission
     @throws BaseException If there is another error
     @see #detachItem(BasicItem)
-  */
-  public void reattachItem(BasicItem item)
+    @since 2.13
+  */
+  public void reattachItem(BasicItem item, boolean updated)
     throws PermissionDeniedException, ItemNotFoundException, BaseException
   {
@@ -1011 +1027 @@
     {
       item.initPermissions(0, 0);
-      if (item.hasPermission(Permission.RESTRICTED_WRITE))
-      {
-        HibernateUtil.lockData(hSession, item.getData(), org.hibernate.LockMode.NONE);
-//        HibernateUtil.updateData(hSession, item.getData());
-      }
-      else if (item.hasPermission(Permission.READ))
-      {
-        HibernateUtil.lockData(hSession, item.getData(), org.hibernate.LockMode.NONE);
+      if (updated)
+      {
+        if (item.hasPermission(Permission.RESTRICTED_WRITE))
+        {
+          HibernateUtil.updateData(hSession, item.getData());
+        }
+        else
+        {
+          throw new PermissionDeniedException(Permission.WRITE, item.toString());
+        }
       }
       else
       {
-        throw new PermissionDeniedException(Permission.READ, item.toString());
+        if (item.hasPermission(Permission.READ))
+        {
+          HibernateUtil.lockData(hSession, item.getData(), org.hibernate.LockMode.NONE);
+        }
+        else
+        {
+          throw new PermissionDeniedException(Permission.READ, item.toString());
+        }
       }
       itemCache.put(item.getData(), item);

trunk/src/test/TestDbControl.java

@@ -128 +128 @@
       r.setName("Detached role");
       dc = TestUtil.getDbControl();
-      dc.reattachItem(r);
+      dc.reattachItem(r, true);
       dc.commit();
       dc.close();