Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-core Commit: c520a819902ea979cc4b2a6f089e5bf09c29e904 https://github.com/hibernate/hibernate-core/commit/c520a819902ea979cc4b2a... Author: Hardy Ferentschik <hardy(a)hibernate.org&gt; Date: 2011-11-24 (Thu, 24 Nov 2011) Changed paths: M hibernate-entitymanager/src/test/resources/hibernate.properties Log Message: ----------- HHH-6843 Increasing the lock timeout. The default timeout is very low (see http://stackoverflow.com/questions/4162557/timeout-error-trying-to-lock-t...) Turns out that at least one test (LockTest) passed due to combination of an uncaught TimeoutException + wrong assumptions. Increasing the timeout seems also more realistic in comparison to other databases. Commit: ab111b6018242aabb13f2923020416b24ab1ff93 https://github.com/hibernate/hibernate-core/commit/ab111b6018242aabb13f29... Author: Hardy Ferentschik <hardy(a)hibernate.org&gt; Date: 2011-11-24 (Thu, 24 Nov 2011) Changed paths: M hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/LockTest.java Log Message: ----------- HHH-6843 Updating LockTest to be less aggressive and more inline with actual isolation requirements The actual changes are in the refactoring of LockTest#testContendedPessimisticLock which got split up into several methods and has the asserts changed The formatting changes fix some generics warning and indentation. Used to be two separate commits, but after some git screw-up became one now Commit: 873517a46f07d88131358021529f1c77885359f7 https://github.com/hibernate/hibernate-core/commit/873517a46f07d881313580... Author: Hardy Ferentschik <hardy(a)hibernate.org&gt; Date: 2011-11-24 (Thu, 24 Nov 2011) Changed paths: M hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/LockTest.java Log Message: ----------- HHH-6843 Second transaction should not commit before the first one Compare: https://github.com/hibernate/hibernate-core/compare/d382e70...873517a