Skip to content

Commit 3c8214f

Browse files
dreab8dreab8
committed
HHH-18770 Check if the monitoring event was null
1 parent f58d5af commit 3c8214f

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
@@ -56,10 +56,10 @@ public SessionOpenEvent beginSessionOpenEvent() {
5656

5757
@Override
5858
public void completeSessionOpenEvent(
59-
HibernateMonitoringEvent event,
59+
HibernateMonitoringEvent monitoringEvent,
6060
SharedSessionContractImplementor session) {
61-
if ( event != null ) {
62-
final SessionOpenEvent sessionOpenEvent = (SessionOpenEvent) event;
61+
if ( monitoringEvent != null ) {
62+
final SessionOpenEvent sessionOpenEvent = (SessionOpenEvent) monitoringEvent;
6363
sessionOpenEvent.end();
6464
if ( sessionOpenEvent.shouldCommit() ) {
6565
sessionOpenEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -82,10 +82,10 @@ public SessionClosedEvent beginSessionClosedEvent() {
8282

8383
@Override
8484
public void completeSessionClosedEvent(
85-
HibernateMonitoringEvent event,
85+
HibernateMonitoringEvent monitoringEvent,
8686
SharedSessionContractImplementor session) {
87-
if ( event != null ) {
88-
final SessionClosedEvent sessionClosedEvent = (SessionClosedEvent) event;
87+
if ( monitoringEvent != null ) {
88+
final SessionClosedEvent sessionClosedEvent = (SessionClosedEvent) monitoringEvent;
8989
sessionClosedEvent.end();
9090
if ( sessionClosedEvent.shouldCommit() ) {
9191
sessionClosedEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -108,11 +108,11 @@ public JdbcConnectionAcquisitionEvent beginJdbcConnectionAcquisitionEvent() {
108108

109109
@Override
110110
public void completeJdbcConnectionAcquisitionEvent(
111-
HibernateMonitoringEvent event,
111+
HibernateMonitoringEvent monitoringEvent,
112112
SharedSessionContractImplementor session,
113113
Object tenantId) {
114-
if ( event != null ) {
115-
final JdbcConnectionAcquisitionEvent jdbcConnectionAcquisitionEvent = (JdbcConnectionAcquisitionEvent) event;
114+
if ( monitoringEvent != null ) {
115+
final JdbcConnectionAcquisitionEvent jdbcConnectionAcquisitionEvent = (JdbcConnectionAcquisitionEvent) monitoringEvent;
116116
jdbcConnectionAcquisitionEvent.end();
117117
if ( jdbcConnectionAcquisitionEvent.shouldCommit() ) {
118118
jdbcConnectionAcquisitionEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -138,11 +138,11 @@ public JdbcConnectionReleaseEvent beginJdbcConnectionReleaseEvent() {
138138

139139
@Override
140140
public void completeJdbcConnectionReleaseEvent(
141-
HibernateMonitoringEvent event,
141+
HibernateMonitoringEvent monitoringEvent,
142142
SharedSessionContractImplementor session,
143143
Object tenantId) {
144-
if ( event != null ) {
145-
final JdbcConnectionReleaseEvent jdbcConnectionReleaseEvent = (JdbcConnectionReleaseEvent) event;
144+
if ( monitoringEvent != null ) {
145+
final JdbcConnectionReleaseEvent jdbcConnectionReleaseEvent = (JdbcConnectionReleaseEvent) monitoringEvent;
146146
jdbcConnectionReleaseEvent.end();
147147
if ( jdbcConnectionReleaseEvent.shouldCommit() ) {
148148
jdbcConnectionReleaseEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -168,10 +168,10 @@ public JdbcPreparedStatementCreationEvent beginJdbcPreparedStatementCreationEven
168168

169169
@Override
170170
public void completeJdbcPreparedStatementCreationEvent(
171-
HibernateMonitoringEvent event,
171+
HibernateMonitoringEvent monitoringEvent,
172172
String preparedStatementSql) {
173-
if ( event != null ) {
174-
final JdbcPreparedStatementCreationEvent jdbcPreparedStatementCreation = (JdbcPreparedStatementCreationEvent) event;
173+
if ( monitoringEvent != null ) {
174+
final JdbcPreparedStatementCreationEvent jdbcPreparedStatementCreation = (JdbcPreparedStatementCreationEvent) monitoringEvent;
175175
jdbcPreparedStatementCreation.end();
176176
if ( jdbcPreparedStatementCreation.shouldCommit() ) {
177177
jdbcPreparedStatementCreation.sql = preparedStatementSql;
@@ -194,10 +194,10 @@ public JdbcPreparedStatementExecutionEvent beginJdbcPreparedStatementExecutionEv
194194

195195
@Override
196196
public void completeJdbcPreparedStatementExecutionEvent(
197-
HibernateMonitoringEvent event,
197+
HibernateMonitoringEvent monitoringEvent,
198198
String preparedStatementSql) {
199-
if ( event != null ) {
200-
final JdbcPreparedStatementExecutionEvent jdbcPreparedStatementExecutionEvent = (JdbcPreparedStatementExecutionEvent) event;
199+
if ( monitoringEvent != null ) {
200+
final JdbcPreparedStatementExecutionEvent jdbcPreparedStatementExecutionEvent = (JdbcPreparedStatementExecutionEvent) monitoringEvent;
201201
jdbcPreparedStatementExecutionEvent.end();
202202
if ( jdbcPreparedStatementExecutionEvent.shouldCommit() ) {
203203
jdbcPreparedStatementExecutionEvent.sql = preparedStatementSql;
@@ -220,10 +220,10 @@ public JdbcBatchExecutionEvent beginJdbcBatchExecutionEvent() {
220220

221221
@Override
222222
public void completeJdbcBatchExecutionEvent(
223-
HibernateMonitoringEvent event,
223+
HibernateMonitoringEvent monitoringEvent,
224224
String statementSql) {
225-
if ( event != null ) {
226-
final JdbcBatchExecutionEvent jdbcBatchExecutionEvent = (JdbcBatchExecutionEvent) event;
225+
if ( monitoringEvent != null ) {
226+
final JdbcBatchExecutionEvent jdbcBatchExecutionEvent = (JdbcBatchExecutionEvent) monitoringEvent;
227227
jdbcBatchExecutionEvent.end();
228228
if ( jdbcBatchExecutionEvent.shouldCommit() ) {
229229
jdbcBatchExecutionEvent.sql = statementSql;
@@ -246,13 +246,13 @@ public HibernateMonitoringEvent beginCachePutEvent() {
246246

247247
@Override
248248
public void completeCachePutEvent(
249-
HibernateMonitoringEvent event,
249+
HibernateMonitoringEvent monitoringEvent,
250250
SharedSessionContractImplementor session,
251251
Region region,
252252
boolean cacheContentChanged,
253253
CacheActionDescription description) {
254-
if ( event != null ) {
255-
final CachePutEvent cachePutEvent = (CachePutEvent) event;
254+
if ( monitoringEvent != null ) {
255+
final CachePutEvent cachePutEvent = (CachePutEvent) monitoringEvent;
256256
cachePutEvent.end();
257257
if ( cachePutEvent.shouldCommit() ) {
258258
cachePutEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -266,14 +266,14 @@ public void completeCachePutEvent(
266266

267267
@Override
268268
public void completeCachePutEvent(
269-
HibernateMonitoringEvent event,
269+
HibernateMonitoringEvent monitoringEvent,
270270
SharedSessionContractImplementor session,
271271
CachedDomainDataAccess cachedDomainDataAccess,
272272
EntityPersister persister,
273273
boolean cacheContentChanged,
274274
CacheActionDescription description) {
275275
completeCachePutEvent(
276-
event,
276+
monitoringEvent,
277277
session,
278278
cachedDomainDataAccess,
279279
persister,
@@ -285,15 +285,15 @@ public void completeCachePutEvent(
285285

286286
@Override
287287
public void completeCachePutEvent(
288-
HibernateMonitoringEvent event,
288+
HibernateMonitoringEvent monitoringEvent,
289289
SharedSessionContractImplementor session,
290290
CachedDomainDataAccess cachedDomainDataAccess,
291291
EntityPersister persister,
292292
boolean cacheContentChanged,
293293
boolean isNatualId,
294294
CacheActionDescription description) {
295-
if ( event != null ) {
296-
final CachePutEvent cachePutEvent = (CachePutEvent) event;
295+
if ( monitoringEvent != null ) {
296+
final CachePutEvent cachePutEvent = (CachePutEvent) monitoringEvent;
297297
cachePutEvent.end();
298298
if ( cachePutEvent.shouldCommit() ) {
299299
cachePutEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -309,14 +309,14 @@ public void completeCachePutEvent(
309309

310310
@Override
311311
public void completeCachePutEvent(
312-
HibernateMonitoringEvent event,
312+
HibernateMonitoringEvent monitoringEvent,
313313
SharedSessionContractImplementor session,
314314
CachedDomainDataAccess cachedDomainDataAccess,
315315
CollectionPersister persister,
316316
boolean cacheContentChanged,
317317
CacheActionDescription description) {
318-
if ( event != null ) {
319-
final CachePutEvent cachePutEvent = (CachePutEvent) event;
318+
if ( monitoringEvent != null ) {
319+
final CachePutEvent cachePutEvent = (CachePutEvent) monitoringEvent;
320320
cachePutEvent.end();
321321
if ( cachePutEvent.shouldCommit() ) {
322322
cachePutEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -343,12 +343,12 @@ public HibernateMonitoringEvent beginCacheGetEvent() {
343343

344344
@Override
345345
public void completeCacheGetEvent(
346-
HibernateMonitoringEvent event,
346+
HibernateMonitoringEvent monitoringEvent,
347347
SharedSessionContractImplementor session,
348348
Region region,
349349
boolean hit) {
350-
if ( event != null ) {
351-
final CacheGetEvent cacheGetEvent = (CacheGetEvent) event;
350+
if ( monitoringEvent != null ) {
351+
final CacheGetEvent cacheGetEvent = (CacheGetEvent) monitoringEvent;
352352
cacheGetEvent.end();
353353
if ( cacheGetEvent.shouldCommit() ) {
354354
cacheGetEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -361,14 +361,14 @@ public void completeCacheGetEvent(
361361

362362
@Override
363363
public void completeCacheGetEvent(
364-
HibernateMonitoringEvent event,
364+
HibernateMonitoringEvent monitoringEvent,
365365
SharedSessionContractImplementor session,
366366
Region region,
367367
EntityPersister persister,
368368
boolean isNaturalKey,
369369
boolean hit) {
370-
if ( event != null ) {
371-
final CacheGetEvent cacheGetEvent = (CacheGetEvent) event;
370+
if ( monitoringEvent != null ) {
371+
final CacheGetEvent cacheGetEvent = (CacheGetEvent) monitoringEvent;
372372
cacheGetEvent.end();
373373
if ( cacheGetEvent.shouldCommit() ) {
374374
cacheGetEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -383,13 +383,13 @@ public void completeCacheGetEvent(
383383

384384
@Override
385385
public void completeCacheGetEvent(
386-
HibernateMonitoringEvent event,
386+
HibernateMonitoringEvent monitoringEvent,
387387
SharedSessionContractImplementor session,
388388
Region region,
389389
CollectionPersister persister,
390390
boolean hit) {
391-
if ( event != null ) {
392-
final CacheGetEvent cacheGetEvent = (CacheGetEvent) event;
391+
if ( monitoringEvent != null ) {
392+
final CacheGetEvent cacheGetEvent = (CacheGetEvent) monitoringEvent;
393393
cacheGetEvent.end();
394394
if ( cacheGetEvent.shouldCommit() ) {
395395
cacheGetEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -422,18 +422,18 @@ public void completeFlushEvent(
422422

423423
@Override
424424
public void completeFlushEvent(
425-
HibernateMonitoringEvent hibernateMonitoringEvent,
426-
org.hibernate.event.spi.FlushEvent event,
425+
HibernateMonitoringEvent monitoringEvent,
426+
org.hibernate.event.spi.FlushEvent hibernateFlushEvent,
427427
boolean autoFlush) {
428-
if ( hibernateMonitoringEvent != null ) {
429-
final FlushEvent flushEvent = (FlushEvent) hibernateMonitoringEvent;
430-
flushEvent.end();
431-
if ( flushEvent.shouldCommit() ) {
432-
flushEvent.sessionIdentifier = getSessionIdentifier( event.getSession() );
433-
flushEvent.numberOfEntitiesProcessed = event.getNumberOfEntitiesProcessed();
434-
flushEvent.numberOfCollectionsProcessed = event.getNumberOfCollectionsProcessed();
435-
flushEvent.isAutoFlush = autoFlush;
436-
flushEvent.commit();
428+
if ( monitoringEvent != null ) {
429+
final FlushEvent jfrFlushEvent = (FlushEvent) monitoringEvent;
430+
jfrFlushEvent.end();
431+
if ( jfrFlushEvent.shouldCommit() ) {
432+
jfrFlushEvent.sessionIdentifier = getSessionIdentifier( hibernateFlushEvent.getSession() );
433+
jfrFlushEvent.numberOfEntitiesProcessed = hibernateFlushEvent.getNumberOfEntitiesProcessed();
434+
jfrFlushEvent.numberOfCollectionsProcessed = hibernateFlushEvent.getNumberOfCollectionsProcessed();
435+
jfrFlushEvent.isAutoFlush = autoFlush;
436+
jfrFlushEvent.commit();
437437
}
438438
}
439439
}
@@ -452,17 +452,17 @@ public PartialFlushEvent beginPartialFlushEvent() {
452452

453453
@Override
454454
public void completePartialFlushEvent(
455-
HibernateMonitoringEvent hibernateMonitoringEvent,
456-
AutoFlushEvent event) {
457-
if ( event != null && hibernateMonitoringEvent != null) {
458-
final PartialFlushEvent flushEvent = (PartialFlushEvent) hibernateMonitoringEvent;
459-
flushEvent.end();
460-
if ( flushEvent.shouldCommit() ) {
461-
flushEvent.sessionIdentifier = getSessionIdentifier( event.getSession() );
462-
flushEvent.numberOfEntitiesProcessed = event.getNumberOfEntitiesProcessed();
463-
flushEvent.numberOfCollectionsProcessed = event.getNumberOfCollectionsProcessed();
464-
flushEvent.isAutoFlush = true;
465-
flushEvent.commit();
455+
HibernateMonitoringEvent monitoringEvent,
456+
AutoFlushEvent hibernateAutoFlushEvent) {
457+
if ( monitoringEvent != null) {
458+
final PartialFlushEvent jfrPartialFlushEvent = (PartialFlushEvent) monitoringEvent;
459+
jfrPartialFlushEvent.end();
460+
if ( jfrPartialFlushEvent.shouldCommit() ) {
461+
jfrPartialFlushEvent.sessionIdentifier = getSessionIdentifier( hibernateAutoFlushEvent.getSession() );
462+
jfrPartialFlushEvent.numberOfEntitiesProcessed = hibernateAutoFlushEvent.getNumberOfEntitiesProcessed();
463+
jfrPartialFlushEvent.numberOfCollectionsProcessed = hibernateAutoFlushEvent.getNumberOfCollectionsProcessed();
464+
jfrPartialFlushEvent.isAutoFlush = true;
465+
jfrPartialFlushEvent.commit();
466466
}
467467
}
468468
}
@@ -481,13 +481,13 @@ public DirtyCalculationEvent beginDirtyCalculationEvent() {
481481

482482
@Override
483483
public void completeDirtyCalculationEvent(
484-
HibernateMonitoringEvent event,
484+
HibernateMonitoringEvent monitoringEvent,
485485
SharedSessionContractImplementor session,
486486
EntityPersister persister,
487487
EntityEntry entry,
488488
int[] dirtyProperties) {
489-
if ( event != null ) {
490-
final DirtyCalculationEvent dirtyCalculationEvent = (DirtyCalculationEvent) event;
489+
if ( monitoringEvent != null ) {
490+
final DirtyCalculationEvent dirtyCalculationEvent = (DirtyCalculationEvent) monitoringEvent;
491491
dirtyCalculationEvent.end();
492492
if ( dirtyCalculationEvent.shouldCommit() ) {
493493
dirtyCalculationEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -513,10 +513,10 @@ public PrePartialFlushEvent beginPrePartialFlush() {
513513

514514
@Override
515515
public void completePrePartialFlush(
516-
HibernateMonitoringEvent event,
516+
HibernateMonitoringEvent monitoringEvent,
517517
SharedSessionContractImplementor session) {
518-
if ( event != null ) {
519-
final PrePartialFlushEvent prePartialFlushEvent = (PrePartialFlushEvent) event;
518+
if ( monitoringEvent != null ) {
519+
final PrePartialFlushEvent prePartialFlushEvent = (PrePartialFlushEvent) monitoringEvent;
520520
prePartialFlushEvent.end();
521521
if ( prePartialFlushEvent.shouldCommit() ) {
522522
prePartialFlushEvent.sessionIdentifier = getSessionIdentifier( session );

0 commit comments

Comments
 (0)