Changeset 4413

Timestamp:

Feb 20, 2013, 3:04:44 PM (10 years ago)

Author:

olle

Message:

Refs #327. Refs #786. Deprecated method lock(Object, LockMode) in Hibernate session replaced by buildLockRequest(LockOptions).lock(object) in classes/files core/HibernateUtil.java and core/DbControl.java, both in api/core/.

Location:

trunk/api/core/src/org/proteios/core

Files:

• DbControl.java (modified) (1 diff)
• HibernateUtil.java (modified) (3 diffs)

trunk/api/core/src/org/proteios/core/DbControl.java

@@ -923 +923 @@
       {
         HibernateUtil.lockData(hSession, item.getData(),
-          org.hibernate.LockMode.NONE);
+          org.hibernate.LockOptions.NONE);
       }
       else

trunk/api/core/src/org/proteios/core/HibernateUtil.java

@@ -29 +29 @@
 import org.hibernate.Hibernate;
 import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
 import org.hibernate.Query;
 import org.hibernate.SQLQuery;
@@ -729 +729 @@
    * Reconnect a disconnected data object to the session, discarding changes
    * that have been made while the object was disconnected. This method is
-   * most useful with <code>lockMode</code> = {@link LockMode#NONE} if the
+   * most useful with <code>lockOptions</code> = {@link LockOptions#NONE} if the
    * logged in user only has read permission to the object.
    * 
    * @see DbControl#reattachItem(BasicItem)
    */
-  static void lockData(Session session, BasicData data, LockMode lockMode)
+  static void lockData(Session session, BasicData data, LockOptions lockOptions)
       throws BaseException
   {
     assert session != null : "session == null";
     assert data != null : "data == null";
-    assert lockMode != null : "lockMode == null";
-    try
-    {
-      session.lock(data, lockMode);
+    assert lockOptions != null : "lockOptions == null";
+    try
+    {
+      session.buildLockRequest(lockOptions).lock(data);
     }
     catch (HibernateException ex)
@@ -965 +965 @@
    * 
    * @see #updateData(Session, BasicData)
-   * @see #lockData(Session, BasicData, LockMode)
+   * @see #lockData(Session, BasicData, LockOptions)
    */
   static void evictData(Session session, BasicData data)