Skip to content

Thread-safety NullPointerException fix for EntityEntryContext #11261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+11 −10
Open

Thread-safety NullPointerException fix for EntityEntryContext #11261

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ba92d7
Thread-safety NullPointerException fix for EntityEntryContext
werner77 Nov 17, 2025
6027a68
Merge branch 'main' into fix/npe-entity-entry-context
werner77 Nov 17, 2025
740c1a1
Null safety fixes in EntityEntryContext
werner77 Nov 17, 2025
d51e27b
Removed unneeded/unwanted changes
werner77 Nov 18, 2025
cde884d
Removed Objects.requireNonNull()
werner77 Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,13 @@ private static boolean isReferenceCachingEnabled(EntityPersister persister) {
private ManagedEntity getAssociatedManagedEntity(Object entity) {
if ( isManagedEntity( entity ) ) {
final var managedEntity = asManagedEntity( entity );
if ( managedEntity.$$_hibernate_getEntityEntry() == null ) {
// it is not associated
return null;
}
final var entityEntry =
(EntityEntryImpl)
managedEntity.$$_hibernate_getEntityEntry();

if ( entityEntry == null ) {
// it is not associated
return null;
}
if ( entityEntry.getPersister().isMutable() ) {
return entityEntry.getPersistenceContext() == persistenceContext
? managedEntity // it is associated
Expand Down Expand Up @@ -449,12 +448,14 @@ public void serialize(ObjectOutputStream oos) throws IOException {
var managedEntity = head;
while ( managedEntity != null ) {
// so we know whether or not to build a ManagedEntityImpl on deserialize
oos.writeBoolean( managedEntity == managedEntity.$$_hibernate_getEntityInstance() );
oos.writeObject( managedEntity.$$_hibernate_getEntityInstance() );
final var instance = managedEntity.$$_hibernate_getEntityInstance();
oos.writeBoolean( managedEntity == instance );
oos.writeObject( instance );
// we need to know which implementation of EntityEntry is being serialized
oos.writeInt( managedEntity.$$_hibernate_getEntityEntry().getClass().getName().length() );
oos.writeChars( managedEntity.$$_hibernate_getEntityEntry().getClass().getName() );
managedEntity.$$_hibernate_getEntityEntry().serialize( oos );
final var entry = managedEntity.$$_hibernate_getEntityEntry();
oos.writeInt( entry.getClass().getName().length() );
oos.writeChars( entry.getClass().getName() );
entry.serialize( oos );
managedEntity = managedEntity.$$_hibernate_getNextManagedEntity();
}
}
Expand Down