Changeset 7279

Timestamp:

Jan 25, 2017, 9:34:04 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

References #2049: Project-specific annotations

Calling HibernateUtil.flush() before HibernateUtil.commit() inside the DbControl.commit() method (see [7255]) results in different exceptions being thrown in some cases. For example, the TestUser.test_duplicate() method fails due not detecting a DatabaseException.

File:

• branches/3.10-stable/src/core/net/sf/basedb/core/HibernateUtil.java (modified) (1 diff)

branches/3.10-stable/src/core/net/sf/basedb/core/HibernateUtil.java

@@ -1402 +1402 @@
       session.flush();
     }
-    catch(HibernateException ex)
+    catch (ConstraintViolationException ex)
+    {
+      // This is the best we can do... I think...
+      throw new DatabaseException(ex.getSQLException());
+    }
+    catch (StaleStateException ex)
+    {
+      throw new ItemModifiedException(ex);
+    }
+    catch (HibernateException ex)
     {
       throw new BaseException(ex);