From a2640a69e659c153f28a718c812d2828b1dad5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kov=C3=A1cs=20=C3=81d=C3=A1m?= Date: Thu, 18 Jan 2024 16:29:42 +0100 Subject: [PATCH] HHH-17652 Fix NullPointerException when mapping audited many-to-one relationships fixes b384b37f395f14f5e64c6b6d4d00e0868d62fe01 --- .../internal/entities/mapper/relation/ToOneIdMapper.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java index c692728b348f..484ec3f1d71e 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java @@ -196,6 +196,9 @@ private boolean isIgnoreNotFound( EntityInfo referencedEntity, Map data, Object primaryKey) { + if (referencedEntity.isAudited()) { + return false; + } final String referencingEntityName = enversService.getEntitiesConfigurations() .getEntityNameForVersionsEntityName( (String) data.get( "$type$" ) );