Branch: refs/heads/main Home: https://github.com/hibernate/hibernate-orm Commit: 39bef7bc70afabb036c1047527cecf80b53fec2b https://github.com/hibernate/hibernate-orm/commit/39bef7bc70afabb036c1047... Author: Gavin King <gavin(a)hibernate.org&gt; Date: 2022-11-08 (Tue, 08 Nov 2022) Changed paths: M hibernate-core/src/main/java/org/hibernate/LockOptions.java M hibernate-core/src/main/java/org/hibernate/jpa/HibernateHints.java Log Message: ----------- HHH-15682 fix potential classloading deadlock + add some documentation around follow-on locking Commit: 3f7133f80bb70a1f1dbe9958e0bf729fcc8d8089 https://github.com/hibernate/hibernate-orm/commit/3f7133f80bb70a1f1dbe995... Author: Gavin King <gavin(a)hibernate.org&gt; Date: 2022-11-08 (Tue, 08 Nov 2022) Changed paths: M hibernate-core/src/main/java/org/hibernate/LockMode.java M hibernate-core/src/main/java/org/hibernate/LockOptions.java M hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java M hibernate-core/src/main/java/org/hibernate/event/spi/LoadEvent.java M hibernate-core/src/main/java/org/hibernate/event/spi/LockEvent.java M hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEvent.java M hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java M hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java M hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQuery.java M hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptionsAdapter.java M hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java M hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java Log Message: ----------- attempt to reduce allocations of LockOptions - Sanne says we were allocating too many of these, so add a static instance of LockOptions for each LockMode - just generally rationalize the code that deals with defaulting LockOptions - change the impl of CascadingActions.LOCK because lock scope has nothing to do with cascading, and I don't see any reason why the LockOptions should not simply propagate if cascading is explicitly turned on Compare: https://github.com/hibernate/hibernate-orm/compare/85836fbcf83f...3f7133f...