Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-17 08:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-7253 NPE thrown by NaturalIdResolutionCache

Browse Source
This commit is contained in:
Strong Liu 2012-04-17 11:18:36 +08:00
parent 5671de517d
commit a67c1afe10
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdXrefDelegate.java
View File

@ -441,6 +441,9 @@ public EntityPersister getPersister() {
}
public boolean sameAsCached(Serializable pk, Object[] naturalIdValues) {
if ( pk == null ) {
return false;
}
final CachedNaturalId initial = pkToNaturalIdMap.get( pk );
if ( initial != null ) {
if ( initial.isSame( naturalIdValues ) ) {
@ -451,6 +454,9 @@ public boolean sameAsCached(Serializable pk, Object[] naturalIdValues) {
}
public boolean cache(Serializable pk, Object[] naturalIdValues) {
if ( pk == null ) {
return false;
}
final CachedNaturalId initial = pkToNaturalIdMap.get( pk );
if ( initial != null ) {
if ( initial.isSame( naturalIdValues ) ) {