Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LockTest changes: better handling of unexpected exception and don't call commit after timing out

This commit is contained in:
Scott Marlow 2011-10-26 22:45:28 -04:00
parent 3c11500618
commit e044cb2ce1
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/LockTest.java
View File

@ -29,6 +29,8 @@ import javax.persistence.LockTimeoutException;
import javax.persistence.OptimisticLockException; import javax.persistence.OptimisticLockException;
import javax.persistence.Query; import javax.persistence.Query;
import javax.persistence.QueryTimeoutException; import javax.persistence.QueryTimeoutException;
import java.lang.RuntimeException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -373,11 +375,11 @@ public class LockTest extends BaseEntityManagerFunctionalTestCase {
try { try {
boolean timedOut = false; // true (success) if LockTimeoutException occurred boolean timedOut = false; // true (success) if LockTimeoutException occurred
em2.getTransaction().begin(); em2.getTransaction().begin();
log.info("testContendedPessimisticReadLockTimeout: (BG) about to read write-locked entity"); log.info("testContendedPessimisticReadLockTimeout: (BG) about to read write-locked entity");
// we should block on the following read // we should block on the following read
Lock lock2 = em2.getReference( Lock.class, id ); Lock lock2 = em2.getReference( Lock.class, id );
lock2.getName(); // force entity to be read lock2.getName(); // force entity to be read
log.info("testContendedPessimisticReadLockTimeout: (BG) read write-locked entity"); log.info("testContendedPessimisticReadLockTimeout: (BG) read write-locked entity");
Map<String,Object> props = new HashMap<String, Object>(); Map<String,Object> props = new HashMap<String, Object>();
// timeout is in milliseconds // timeout is in milliseconds
props.put("javax.persistence.lock.timeout", new Integer(1000)); props.put("javax.persistence.lock.timeout", new Integer(1000));
@ -386,11 +388,14 @@ public class LockTest extends BaseEntityManagerFunctionalTestCase {
} }
catch( LockTimeoutException e) { catch( LockTimeoutException e) {
// success // success
log.info("testContendedPessimisticReadLockTimeout: (BG) got expected timeout exception"); log.info("testContendedPessimisticReadLockTimeout: (BG) got expected timeout exception");
timedOut = true; timedOut = true;
em2.getTransaction().rollback();
return new Boolean(timedOut);
} }
catch ( Throwable e) { catch ( Throwable e) {
log.info("Expected LockTimeoutException but got unexpected exception", e); log.info("Expected LockTimeoutException but got unexpected exception", e);
throw new RuntimeException("Expected LockTimeoutException but got unexpected exception",e);
} }
em2.getTransaction().commit(); em2.getTransaction().commit();
return new Boolean(timedOut); return new Boolean(timedOut);