Merge pull request #588 from tdonohue/DS-1408

DS-1408 : Increase database lock timeout to avoid lock errors
DSpace · Jul 25, 2014 · 5556842 · 5556842
2 parents 849effb + 44bae8c
commit 5556842
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/filters/testEnvironment.properties b/src/main/filters/testEnvironment.properties
@@ -32,7 +32,8 @@ default.language = en_US
 # Database name ("oracle", or "postgres")
 
 db.name = oracle
-db.url = jdbc:h2:mem:test;MODE=Oracle
+# Use a 10 second database lock timeout to avoid occasional JDBC lock timeout errors
+db.url = jdbc:h2:mem:test;MODE=Oracle;LOCK_TIMEOUT=10000
 db.driver = org.h2.Driver
 db.username = sa
 db.password = sa