From 8bd4d27d2fe5192762b05cb47c71bb6f7c213c81 Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Thu, 7 Feb 2019 15:17:38 +0100 Subject: [PATCH] increase h2 lock timeout --- .../src/main/java/com/sismics/docs/core/dao/DocumentDao.java | 4 ++-- docs-core/src/main/java/com/sismics/util/jpa/EMF.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs-core/src/main/java/com/sismics/docs/core/dao/DocumentDao.java b/docs-core/src/main/java/com/sismics/docs/core/dao/DocumentDao.java index e9a68430..1a05a6e0 100644 --- a/docs-core/src/main/java/com/sismics/docs/core/dao/DocumentDao.java +++ b/docs-core/src/main/java/com/sismics/docs/core/dao/DocumentDao.java @@ -231,11 +231,11 @@ public class DocumentDao { * @param document Document */ public void updateFileId(Document document) { - /*EntityManager em = ThreadLocalContext.get().getEntityManager(); + EntityManager em = ThreadLocalContext.get().getEntityManager(); Query query = em.createNativeQuery("update T_DOCUMENT d set d.DOC_IDFILE_C = :fileId where d.DOC_ID_C = :id"); query.setParameter("fileId", document.getFileId()); query.setParameter("id", document.getId()); - query.executeUpdate();*/ + query.executeUpdate(); } diff --git a/docs-core/src/main/java/com/sismics/util/jpa/EMF.java b/docs-core/src/main/java/com/sismics/util/jpa/EMF.java index 0a2bde20..74c198d5 100644 --- a/docs-core/src/main/java/com/sismics/util/jpa/EMF.java +++ b/docs-core/src/main/java/com/sismics/util/jpa/EMF.java @@ -88,7 +88,7 @@ public final class EMF { if (databaseUrl == null) { props.put("hibernate.connection.driver_class", "org.h2.Driver"); props.put("hibernate.dialect", "org.hibernate.dialect.HSQLDialect"); - props.put("hibernate.connection.url", "jdbc:h2:file:" + dbFile + ";CACHE_SIZE=65536"); + props.put("hibernate.connection.url", "jdbc:h2:file:" + dbFile + ";CACHE_SIZE=65536;LOCK_TIMEOUT=10000"); props.put("hibernate.connection.username", "sa"); } else { props.put("hibernate.connection.driver_class", "org.postgresql.Driver");