Skip to content

Commit 412bfed

Browse files
dreab8dreab8
committed
HHH-18770 Check if the monitoring event was null
1 parent 46cb140 commit 412bfed

File tree

1 file changed

+69
-69
lines changed

1 file changed

+69
-69
lines changed

‎hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JfrEventManager.java‎

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ public SessionOpenEvent beginSessionOpenEvent() {
5454

5555
@Override
5656
public void completeSessionOpenEvent(
57-
HibernateMonitoringEvent event,
57+
HibernateMonitoringEvent monitoringEvent,
5858
SharedSessionContractImplementor session) {
59-
if ( event != null ) {
60-
final SessionOpenEvent sessionOpenEvent = (SessionOpenEvent) event;
59+
if ( monitoringEvent != null ) {
60+
final SessionOpenEvent sessionOpenEvent = (SessionOpenEvent) monitoringEvent;
6161
sessionOpenEvent.end();
6262
if ( sessionOpenEvent.shouldCommit() ) {
6363
sessionOpenEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -80,10 +80,10 @@ public SessionClosedEvent beginSessionClosedEvent() {
8080

8181
@Override
8282
public void completeSessionClosedEvent(
83-
HibernateMonitoringEvent event,
83+
HibernateMonitoringEvent monitoringEvent,
8484
SharedSessionContractImplementor session) {
85-
if ( event != null ) {
86-
final SessionClosedEvent sessionClosedEvent = (SessionClosedEvent) event;
85+
if ( monitoringEvent != null ) {
86+
final SessionClosedEvent sessionClosedEvent = (SessionClosedEvent) monitoringEvent;
8787
sessionClosedEvent.end();
8888
if ( sessionClosedEvent.shouldCommit() ) {
8989
sessionClosedEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -106,11 +106,11 @@ public JdbcConnectionAcquisitionEvent beginJdbcConnectionAcquisitionEvent() {
106106

107107
@Override
108108
public void completeJdbcConnectionAcquisitionEvent(
109-
HibernateMonitoringEvent event,
109+
HibernateMonitoringEvent monitoringEvent,
110110
SharedSessionContractImplementor session,
111111
Object tenantId) {
112-
if ( event != null ) {
113-
final JdbcConnectionAcquisitionEvent jdbcConnectionAcquisitionEvent = (JdbcConnectionAcquisitionEvent) event;
112+
if ( monitoringEvent != null ) {
113+
final JdbcConnectionAcquisitionEvent jdbcConnectionAcquisitionEvent = (JdbcConnectionAcquisitionEvent) monitoringEvent;
114114
jdbcConnectionAcquisitionEvent.end();
115115
if ( jdbcConnectionAcquisitionEvent.shouldCommit() ) {
116116
jdbcConnectionAcquisitionEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -136,11 +136,11 @@ public JdbcConnectionReleaseEvent beginJdbcConnectionReleaseEvent() {
136136

137137
@Override
138138
public void completeJdbcConnectionReleaseEvent(
139-
HibernateMonitoringEvent event,
139+
HibernateMonitoringEvent monitoringEvent,
140140
SharedSessionContractImplementor session,
141141
Object tenantId) {
142-
if ( event != null ) {
143-
final JdbcConnectionReleaseEvent jdbcConnectionReleaseEvent = (JdbcConnectionReleaseEvent) event;
142+
if ( monitoringEvent != null ) {
143+
final JdbcConnectionReleaseEvent jdbcConnectionReleaseEvent = (JdbcConnectionReleaseEvent) monitoringEvent;
144144
jdbcConnectionReleaseEvent.end();
145145
if ( jdbcConnectionReleaseEvent.shouldCommit() ) {
146146
jdbcConnectionReleaseEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -166,10 +166,10 @@ public JdbcPreparedStatementCreationEvent beginJdbcPreparedStatementCreationEven
166166

167167
@Override
168168
public void completeJdbcPreparedStatementCreationEvent(
169-
HibernateMonitoringEvent event,
169+
HibernateMonitoringEvent monitoringEvent,
170170
String preparedStatementSql) {
171-
if ( event != null ) {
172-
final JdbcPreparedStatementCreationEvent jdbcPreparedStatementCreation = (JdbcPreparedStatementCreationEvent) event;
171+
if ( monitoringEvent != null ) {
172+
final JdbcPreparedStatementCreationEvent jdbcPreparedStatementCreation = (JdbcPreparedStatementCreationEvent) monitoringEvent;
173173
jdbcPreparedStatementCreation.end();
174174
if ( jdbcPreparedStatementCreation.shouldCommit() ) {
175175
jdbcPreparedStatementCreation.sql = preparedStatementSql;
@@ -192,10 +192,10 @@ public JdbcPreparedStatementExecutionEvent beginJdbcPreparedStatementExecutionEv
192192

193193
@Override
194194
public void completeJdbcPreparedStatementExecutionEvent(
195-
HibernateMonitoringEvent event,
195+
HibernateMonitoringEvent monitoringEvent,
196196
String preparedStatementSql) {
197-
if ( event != null ) {
198-
final JdbcPreparedStatementExecutionEvent jdbcPreparedStatementExecutionEvent = (JdbcPreparedStatementExecutionEvent) event;
197+
if ( monitoringEvent != null ) {
198+
final JdbcPreparedStatementExecutionEvent jdbcPreparedStatementExecutionEvent = (JdbcPreparedStatementExecutionEvent) monitoringEvent;
199199
jdbcPreparedStatementExecutionEvent.end();
200200
if ( jdbcPreparedStatementExecutionEvent.shouldCommit() ) {
201201
jdbcPreparedStatementExecutionEvent.sql = preparedStatementSql;
@@ -218,10 +218,10 @@ public JdbcBatchExecutionEvent beginJdbcBatchExecutionEvent() {
218218

219219
@Override
220220
public void completeJdbcBatchExecutionEvent(
221-
HibernateMonitoringEvent event,
221+
HibernateMonitoringEvent monitoringEvent,
222222
String statementSql) {
223-
if ( event != null ) {
224-
final JdbcBatchExecutionEvent jdbcBatchExecutionEvent = (JdbcBatchExecutionEvent) event;
223+
if ( monitoringEvent != null ) {
224+
final JdbcBatchExecutionEvent jdbcBatchExecutionEvent = (JdbcBatchExecutionEvent) monitoringEvent;
225225
jdbcBatchExecutionEvent.end();
226226
if ( jdbcBatchExecutionEvent.shouldCommit() ) {
227227
jdbcBatchExecutionEvent.sql = statementSql;
@@ -244,13 +244,13 @@ public HibernateMonitoringEvent beginCachePutEvent() {
244244

245245
@Override
246246
public void completeCachePutEvent(
247-
HibernateMonitoringEvent event,
247+
HibernateMonitoringEvent monitoringEvent,
248248
SharedSessionContractImplementor session,
249249
Region region,
250250
boolean cacheContentChanged,
251251
CacheActionDescription description) {
252-
if ( event != null ) {
253-
final CachePutEvent cachePutEvent = (CachePutEvent) event;
252+
if ( monitoringEvent != null ) {
253+
final CachePutEvent cachePutEvent = (CachePutEvent) monitoringEvent;
254254
cachePutEvent.end();
255255
if ( cachePutEvent.shouldCommit() ) {
256256
cachePutEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -264,14 +264,14 @@ public void completeCachePutEvent(
264264

265265
@Override
266266
public void completeCachePutEvent(
267-
HibernateMonitoringEvent event,
267+
HibernateMonitoringEvent monitoringEvent,
268268
SharedSessionContractImplementor session,
269269
CachedDomainDataAccess cachedDomainDataAccess,
270270
EntityPersister persister,
271271
boolean cacheContentChanged,
272272
CacheActionDescription description) {
273273
completeCachePutEvent(
274-
event,
274+
monitoringEvent,
275275
session,
276276
cachedDomainDataAccess,
277277
persister,
@@ -283,15 +283,15 @@ public void completeCachePutEvent(
283283

284284
@Override
285285
public void completeCachePutEvent(
286-
HibernateMonitoringEvent event,
286+
HibernateMonitoringEvent monitoringEvent,
287287
SharedSessionContractImplementor session,
288288
CachedDomainDataAccess cachedDomainDataAccess,
289289
EntityPersister persister,
290290
boolean cacheContentChanged,
291291
boolean isNatualId,
292292
CacheActionDescription description) {
293-
if ( event != null ) {
294-
final CachePutEvent cachePutEvent = (CachePutEvent) event;
293+
if ( monitoringEvent != null ) {
294+
final CachePutEvent cachePutEvent = (CachePutEvent) monitoringEvent;
295295
cachePutEvent.end();
296296
if ( cachePutEvent.shouldCommit() ) {
297297
cachePutEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -307,14 +307,14 @@ public void completeCachePutEvent(
307307

308308
@Override
309309
public void completeCachePutEvent(
310-
HibernateMonitoringEvent event,
310+
HibernateMonitoringEvent monitoringEvent,
311311
SharedSessionContractImplementor session,
312312
CachedDomainDataAccess cachedDomainDataAccess,
313313
CollectionPersister persister,
314314
boolean cacheContentChanged,
315315
CacheActionDescription description) {
316-
if ( event != null ) {
317-
final CachePutEvent cachePutEvent = (CachePutEvent) event;
316+
if ( monitoringEvent != null ) {
317+
final CachePutEvent cachePutEvent = (CachePutEvent) monitoringEvent;
318318
cachePutEvent.end();
319319
if ( cachePutEvent.shouldCommit() ) {
320320
cachePutEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -341,12 +341,12 @@ public HibernateMonitoringEvent beginCacheGetEvent() {
341341

342342
@Override
343343
public void completeCacheGetEvent(
344-
HibernateMonitoringEvent event,
344+
HibernateMonitoringEvent monitoringEvent,
345345
SharedSessionContractImplementor session,
346346
Region region,
347347
boolean hit) {
348-
if ( event != null ) {
349-
final CacheGetEvent cacheGetEvent = (CacheGetEvent) event;
348+
if ( monitoringEvent != null ) {
349+
final CacheGetEvent cacheGetEvent = (CacheGetEvent) monitoringEvent;
350350
cacheGetEvent.end();
351351
if ( cacheGetEvent.shouldCommit() ) {
352352
cacheGetEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -359,14 +359,14 @@ public void completeCacheGetEvent(
359359

360360
@Override
361361
public void completeCacheGetEvent(
362-
HibernateMonitoringEvent event,
362+
HibernateMonitoringEvent monitoringEvent,
363363
SharedSessionContractImplementor session,
364364
Region region,
365365
EntityPersister persister,
366366
boolean isNaturalKey,
367367
boolean hit) {
368-
if ( event != null ) {
369-
final CacheGetEvent cacheGetEvent = (CacheGetEvent) event;
368+
if ( monitoringEvent != null ) {
369+
final CacheGetEvent cacheGetEvent = (CacheGetEvent) monitoringEvent;
370370
cacheGetEvent.end();
371371
if ( cacheGetEvent.shouldCommit() ) {
372372
cacheGetEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -381,13 +381,13 @@ public void completeCacheGetEvent(
381381

382382
@Override
383383
public void completeCacheGetEvent(
384-
HibernateMonitoringEvent event,
384+
HibernateMonitoringEvent monitoringEvent,
385385
SharedSessionContractImplementor session,
386386
Region region,
387387
CollectionPersister persister,
388388
boolean hit) {
389-
if ( event != null ) {
390-
final CacheGetEvent cacheGetEvent = (CacheGetEvent) event;
389+
if ( monitoringEvent != null ) {
390+
final CacheGetEvent cacheGetEvent = (CacheGetEvent) monitoringEvent;
391391
cacheGetEvent.end();
392392
if ( cacheGetEvent.shouldCommit() ) {
393393
cacheGetEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -420,18 +420,18 @@ public void completeFlushEvent(
420420

421421
@Override
422422
public void completeFlushEvent(
423-
HibernateMonitoringEvent hibernateMonitoringEvent,
424-
org.hibernate.event.spi.FlushEvent event,
423+
HibernateMonitoringEvent monitoringEvent,
424+
org.hibernate.event.spi.FlushEvent hibernateFlushEvent,
425425
boolean autoFlush) {
426-
if ( hibernateMonitoringEvent != null ) {
427-
final FlushEvent flushEvent = (FlushEvent) hibernateMonitoringEvent;
428-
flushEvent.end();
429-
if ( flushEvent.shouldCommit() ) {
430-
flushEvent.sessionIdentifier = getSessionIdentifier( event.getSession() );
431-
flushEvent.numberOfEntitiesProcessed = event.getNumberOfEntitiesProcessed();
432-
flushEvent.numberOfCollectionsProcessed = event.getNumberOfCollectionsProcessed();
433-
flushEvent.isAutoFlush = autoFlush;
434-
flushEvent.commit();
426+
if ( monitoringEvent != null ) {
427+
final FlushEvent jfrFlushEvent = (FlushEvent) monitoringEvent;
428+
jfrFlushEvent.end();
429+
if ( jfrFlushEvent.shouldCommit() ) {
430+
jfrFlushEvent.sessionIdentifier = getSessionIdentifier( hibernateFlushEvent.getSession() );
431+
jfrFlushEvent.numberOfEntitiesProcessed = hibernateFlushEvent.getNumberOfEntitiesProcessed();
432+
jfrFlushEvent.numberOfCollectionsProcessed = hibernateFlushEvent.getNumberOfCollectionsProcessed();
433+
jfrFlushEvent.isAutoFlush = autoFlush;
434+
jfrFlushEvent.commit();
435435
}
436436
}
437437
}
@@ -450,17 +450,17 @@ public PartialFlushEvent beginPartialFlushEvent() {
450450

451451
@Override
452452
public void completePartialFlushEvent(
453-
HibernateMonitoringEvent hibernateMonitoringEvent,
454-
AutoFlushEvent event) {
455-
if ( event != null && hibernateMonitoringEvent != null) {
456-
final PartialFlushEvent flushEvent = (PartialFlushEvent) hibernateMonitoringEvent;
457-
flushEvent.end();
458-
if ( flushEvent.shouldCommit() ) {
459-
flushEvent.sessionIdentifier = getSessionIdentifier( event.getSession() );
460-
flushEvent.numberOfEntitiesProcessed = event.getNumberOfEntitiesProcessed();
461-
flushEvent.numberOfCollectionsProcessed = event.getNumberOfCollectionsProcessed();
462-
flushEvent.isAutoFlush = true;
463-
flushEvent.commit();
453+
HibernateMonitoringEvent monitoringEvent,
454+
AutoFlushEvent hibernateAutoFlushEvent) {
455+
if ( monitoringEvent != null) {
456+
final PartialFlushEvent jfrPartialFlushEvent = (PartialFlushEvent) monitoringEvent;
457+
jfrPartialFlushEvent.end();
458+
if ( jfrPartialFlushEvent.shouldCommit() ) {
459+
jfrPartialFlushEvent.sessionIdentifier = getSessionIdentifier( hibernateAutoFlushEvent.getSession() );
460+
jfrPartialFlushEvent.numberOfEntitiesProcessed = hibernateAutoFlushEvent.getNumberOfEntitiesProcessed();
461+
jfrPartialFlushEvent.numberOfCollectionsProcessed = hibernateAutoFlushEvent.getNumberOfCollectionsProcessed();
462+
jfrPartialFlushEvent.isAutoFlush = true;
463+
jfrPartialFlushEvent.commit();
464464
}
465465
}
466466
}
@@ -479,13 +479,13 @@ public DirtyCalculationEvent beginDirtyCalculationEvent() {
479479

480480
@Override
481481
public void completeDirtyCalculationEvent(
482-
HibernateMonitoringEvent event,
482+
HibernateMonitoringEvent monitoringEvent,
483483
SharedSessionContractImplementor session,
484484
EntityPersister persister,
485485
EntityEntry entry,
486486
int[] dirtyProperties) {
487-
if ( event != null ) {
488-
final DirtyCalculationEvent dirtyCalculationEvent = (DirtyCalculationEvent) event;
487+
if ( monitoringEvent != null ) {
488+
final DirtyCalculationEvent dirtyCalculationEvent = (DirtyCalculationEvent) monitoringEvent;
489489
dirtyCalculationEvent.end();
490490
if ( dirtyCalculationEvent.shouldCommit() ) {
491491
dirtyCalculationEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -511,10 +511,10 @@ public PrePartialFlushEvent beginPrePartialFlush() {
511511

512512
@Override
513513
public void completePrePartialFlush(
514-
HibernateMonitoringEvent event,
514+
HibernateMonitoringEvent monitoringEvent,
515515
SharedSessionContractImplementor session) {
516-
if ( event != null ) {
517-
final PrePartialFlushEvent prePartialFlushEvent = (PrePartialFlushEvent) event;
516+
if ( monitoringEvent != null ) {
517+
final PrePartialFlushEvent prePartialFlushEvent = (PrePartialFlushEvent) monitoringEvent;
518518
prePartialFlushEvent.end();
519519
if ( prePartialFlushEvent.shouldCommit() ) {
520520
prePartialFlushEvent.sessionIdentifier = getSessionIdentifier( session );

0 commit comments

Comments
 (0)