Skip to content

HHH-13110 - @PreUpdate method on a Embeddable null on the parent caus… #3485

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

Merged
merged 1 commit into from
Aug 3, 2020
Merged

HHH-13110 - @PreUpdate method on a Embeddable null on the parent caus… #3485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/jpa/event/internal/EmbeddableCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ final class EmbeddableCallback extends AbstractCallback {
public boolean performCallback(Object entity) {
try {
Object embeddable = embeddableGetter.get( entity );
callbackMethod.invoke( embeddable );
if ( embeddable != null ) {
callbackMethod.invoke( embeddable );
}
return true;
}
catch (InvocationTargetException e) {
Expand Down
24 changes: 22 additions & 2 deletions hibernate-core/src/test/java/org/hibernate/event/EmbeddableCallbackTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@

import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;

/**
* @author Vlad Mihalcea
*/
@TestForIssue(jiraKey = "HHH-12326")
public class EmbeddableCallbackTest extends BaseEntityManagerFunctionalTestCase {

@Override
Expand All @@ -31,9 +31,11 @@ protected Class<?>[] getAnnotatedClasses() {
}

@Test
@TestForIssue(jiraKey = "HHH-12326")
public void test() {
doInJPA( this::entityManagerFactory, entityManager -> {
Employee employee = new Employee();
employee.details = new EmployeeDetails();
employee.id = 1;

entityManager.persist( employee );
Expand All @@ -47,6 +49,24 @@ public void test() {
} );
}

@Test
@TestForIssue(jiraKey = "HHH-13110")
public void testNullEmbeddable() {
doInJPA( this::entityManagerFactory, entityManager -> {
Employee employee = new Employee();
employee.id = 1;

entityManager.persist( employee );
} );

doInJPA( this::entityManagerFactory, entityManager -> {
Employee employee = entityManager.find( Employee.class, 1 );

assertEquals( "Vlad", employee.name );
assertNull( employee.details );
} );
}

@Entity(name = "Employee")
public static class Employee {

Expand All @@ -55,7 +75,7 @@ public static class Employee {

private String name;

private EmployeeDetails details = new EmployeeDetails();
private EmployeeDetails details;

@PrePersist
public void setUp() {
Expand Down