@@ -155,14 +155,23 @@ public Object insert(String entityName, Object entity) {
155155 if ( !generator .generatesOnInsert () ) {
156156 throw new IdentifierGenerationException ( "Identifier generator must generate on insert" );
157157 }
158- id = ( (BeforeExecutionGenerator ) generator ).generate ( this , entity , null , INSERT );
158+ id = ( (BeforeExecutionGenerator ) generator ).generate ( this , entity , null , INSERT );
159+ persister .setIdentifier ( entity , id , this );
159160 if ( firePreInsert (entity , id , state , persister ) ) {
160161 return id ;
161162 }
162163 else {
163164 getInterceptor ().onInsert ( entity , id , state , persister .getPropertyNames (), persister .getPropertyTypes () );
164- persister .getInsertCoordinator ().insert ( entity , id , state , this );
165- persister .setIdentifier ( entity , id , this );
165+ final EventMonitor eventMonitor = getEventMonitor ();
166+ final DiagnosticEvent event = eventMonitor .beginEntityInsertEvent ();
167+ boolean success = false ;
168+ try {
169+ persister .getInsertCoordinator ().insert ( entity , id , state , this );
170+ success = true ;
171+ }
172+ finally {
173+ eventMonitor .completeEntityInsertEvent ( event , id , persister .getEntityName (), success , this );
174+ }
166175 }
167176 }
168177 else if ( generator .generatedOnExecution ( entity , this ) ) {
0 commit comments