HHH-12723 - Revert the changes applied by HHH-12585 to the DefaultFlushEntityEventListener#invokeInterceptor() method

This reverts commit 9b00aaf9a5.
This commit is contained in:
Andrea Boriero 2018-06-25 10:16:05 +01:00
parent a30635f14a
commit 337646de13
1 changed files with 3 additions and 5 deletions

View File

@ -359,11 +359,7 @@ public class DefaultFlushEntityEventListener implements FlushEntityEventListener
} }
} }
if ( isDirty ) { final boolean answerFromInterceptor = session.getInterceptor().onFlushDirty(
return true;
}
return session.getInterceptor().onFlushDirty(
entity, entity,
entry.getId(), entry.getId(),
values, values,
@ -371,6 +367,8 @@ public class DefaultFlushEntityEventListener implements FlushEntityEventListener
persister.getPropertyNames(), persister.getPropertyNames(),
persister.getPropertyTypes() persister.getPropertyTypes()
); );
return answerFromInterceptor || isDirty;
} }
private boolean copyState(Object entity, Type[] types, Object[] state, SessionFactory sf) { private boolean copyState(Object entity, Type[] types, Object[] state, SessionFactory sf) {