Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: ed266c593a4d203957b4364ab8d7a3d5404815ca https://github.com/hibernate/hibernate-orm/commit/ed266c593a4d203957b4364... Author: Strong Liu <stliu(a)hibernate.org&gt; Date: 2012-05-29 (Tue, 29 May 2012) Changed paths: M hibernate-core/src/matrix/java/org/hibernate/test/locking/LockModeTest.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java M hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/LockTest.java Log Message: ----------- HHH-6256 persistence.xml-specified javax.persistence.lock.timeout is ignored HHH-6846 Support for Query.setHint(javax.persistence.lock.timeout)