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

HHH-10554 - Fix NPE in dirty tracking generated code of bytecode enhanced @Embeddable entities 

(cherry picked from commit c5104601e1)
This commit is contained in:
barreiro 2016-02-23 00:03:55 +00:00 committed by Steve Ebersole
parent ae25390006
commit 6a4128653a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/PersistentAttributesEnhancer.java
View File

@ -448,7 +448,7 @@ public class PersistentAttributesEnhancer extends Enhancer {
// trigger track changes // trigger track changes
fieldWriter.insertAfter( fieldWriter.insertAfter(
String.format( String.format(
"((%2$s) %1$s).%4$s(\"%1$s\", (%3$s) this);%n" + "if (%1$s != null) { ((%2$s) %1$s).%4$s(\"%1$s\", (%3$s) this); }%n" +
"%5$s(\"%1$s\");", "%5$s(\"%1$s\");",
persistentField.getName(), persistentField.getName(),
CompositeTracker.class.getName(), CompositeTracker.class.getName(),

3
hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/dirty/DirtyTrackingTestTask.java
View File

@ -84,6 +84,9 @@ public class DirtyTrackingTestTask extends AbstractEnhancerTestTask {
country.setName( "Norway" ); country.setName( "Norway" );
EnhancerTestUtils.checkDirtyTracking( entity, "address", "address.country" ); EnhancerTestUtils.checkDirtyTracking( entity, "address", "address.country" );
address.setCountry( null );
entity.setAddress( null );
} }
protected void cleanup() { protected void cleanup() {