prevent database deadlocks #6846 #6865 #7020

IQSS · Jun 26, 2020 · 1e4cb6f · 1e4cb6f · pdurbin · Jun 26, 2020
1 parent b97185a
commit 1e4cb6f
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java
@@ -116,12 +116,8 @@ public DvObject findByGlobalId(String globalIdString, String typeString, Boolean
     }
 
     public DvObject updateContentIndexTime(DvObject dvObject) {
-        /**
-         * @todo to avoid a possible OptimisticLockException, should we merge
-         * dvObject before we try to setIndexTime? See
-         * https://github.com/IQSS/dataverse/commit/6ad0ebb272c8cb46368cb76784b55dbf33eea947
-         */
-        DvObject dvObjectToModify = findDvObject(dvObject.getId());
+        // We merge first because we've been seeing database deadlocks.
+        DvObject dvObjectToModify = em.merge(dvObject);
         dvObjectToModify.setIndexTime(new Timestamp(new Date().getTime()));
         DvObject savedDvObject = em.merge(dvObjectToModify);
         return savedDvObject;