Branch: refs/heads/4.2 Home: https://github.com/hibernate/hibernate-orm Commit: 3d932aeb330d9fcc4e7535bc832cf0f6f9216867 https://github.com/hibernate/hibernate-orm/commit/3d932aeb330d9fcc4e7535b... Author: Juergen Zimmermann <Juergen.Zimmermann (at) HS-Karlsruhe.de> Date: 2013-10-15 (Tue, 15 Oct 2013) Changed paths: M hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java Log Message: ----------- HHH-8032 OptimisticLockException with message of the wrapped StaleObjectStateException Conflicts: hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java