Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-18632 Concurrency issue with AbstractEntityPersister#nonLazyPropertyLoadPlansByName

This commit is contained in:
Andrea Boriero 2024-09-18 15:30:35 +02:00 committed by Andrea Boriero
parent 0f0f50de96
commit 307fb20c28
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
View File

@ -496,7 +496,7 @@ public abstract class AbstractEntityPersister
private final boolean implementsLifecycle; private final boolean implementsLifecycle;
private List<UniqueKeyEntry> uniqueKeyEntries = null; //lazily initialized private List<UniqueKeyEntry> uniqueKeyEntries = null; //lazily initialized
private HashMap<String,SingleIdArrayLoadPlan> nonLazyPropertyLoadPlansByName; private ConcurrentHashMap<String,SingleIdArrayLoadPlan> nonLazyPropertyLoadPlansByName;
@Deprecated(since = "6.0") @Deprecated(since = "6.0")
public AbstractEntityPersister( public AbstractEntityPersister(
@ -1671,17 +1671,17 @@ public abstract class AbstractEntityPersister
int propertyIndex = getPropertyIndex( fieldName ); int propertyIndex = getPropertyIndex( fieldName );
partsToSelect.add( getAttributeMapping( propertyIndex ) ); partsToSelect.add( getAttributeMapping( propertyIndex ) );
SingleIdArrayLoadPlan lazyLoanPlan; SingleIdArrayLoadPlan lazyLoanPlan;
if ( nonLazyPropertyLoadPlansByName == null ) { ConcurrentHashMap<String, SingleIdArrayLoadPlan> propertyLoadPlansByName = this.nonLazyPropertyLoadPlansByName;
nonLazyPropertyLoadPlansByName = new HashMap<>(); if ( propertyLoadPlansByName == null ) {
propertyLoadPlansByName = new ConcurrentHashMap<>();
lazyLoanPlan = createLazyLoanPlan( partsToSelect ); lazyLoanPlan = createLazyLoanPlan( partsToSelect );
; propertyLoadPlansByName.put( fieldName, lazyLoanPlan );
nonLazyPropertyLoadPlansByName.put( fieldName, lazyLoanPlan ); this.nonLazyPropertyLoadPlansByName = propertyLoadPlansByName;
} }
else { else {
lazyLoanPlan = nonLazyPropertyLoadPlansByName.get( fieldName ); lazyLoanPlan = nonLazyPropertyLoadPlansByName.get( fieldName );
if ( lazyLoanPlan == null ) { if ( lazyLoanPlan == null ) {
lazyLoanPlan = createLazyLoanPlan( partsToSelect ); lazyLoanPlan = createLazyLoanPlan( partsToSelect );
;
nonLazyPropertyLoadPlansByName.put( fieldName, lazyLoanPlan ); nonLazyPropertyLoadPlansByName.put( fieldName, lazyLoanPlan );
} }
} }