Branch: refs/heads/5.4 Home: https://github.com/hibernate/hibernate-orm Commit: 761f5ab8048fadd764209af70d9a1a7cd83ca713 https://github.com/hibernate/hibernate-orm/commit/761f5ab8048fadd764209af... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2021-07-15 (Thu, 15 Jul 2021) Changed paths: A hibernate-core/src/test/java/org/hibernate/jpa/test/ops/MergeJpaComplianceTest.java Log Message: ----------- HHH-14608 Add test for issue (cherry picked from commit 8dcf6f983b18d1f5d6a6cc3d66b0f7cb84d2d935) Commit: ecd35ded075aa8f38da77217b369e1bbe7861cdc https://github.com/hibernate/hibernate-orm/commit/ecd35ded075aa8f38da7721... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2021-07-15 (Thu, 15 Jul 2021) Changed paths: M hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEvictEventListener.java M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java M hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java M hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java M hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java M hibernate-core/src/main/java/org/hibernate/proxy/LazyInitializer.java M hibernate-core/src/main/java/org/hibernate/proxy/map/MapProxy.java M hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyInterceptor.java M hibernate-core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java M hibernate-core/src/main/java/org/hibernate/tuple/entity/AbstractEntityTuplizer.java M hibernate-core/src/main/java/org/hibernate/type/EntityType.java M hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversEventListener.java M hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityInstantiator.java M hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SingleIdMapper.java M hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/VirtualEntitySingleIdMapper.java M hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/EntityTools.java M hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityQuery.java M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/ProxyIdentifier.java Log Message: ----------- HHH-14608 Merge causes StackOverflow when JPA proxy compliance is enabled (cherry picked from commit 8b02aaf5a8711446457665e96b69161b57026cea) Compare: https://github.com/hibernate/hibernate-orm/compare/0c37ab3a1682...ecd35de...