Skip to content

Commit 7dfd5e0

Browse files
dreab8beikov
dreab8
authored and
beikov
committed
HHH-18770 Check if the monitoring event was null
1 parent e862ddb commit 7dfd5e0

File tree

1 file changed

+54
-55
lines changed

1 file changed

+54
-55
lines changed

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

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

5959
@Override
6060
public void completeSessionOpenEvent(
61-
HibernateMonitoringEvent event,
61+
HibernateMonitoringEvent monitoringEvent,
6262
SharedSessionContractImplementor session) {
63-
if ( event != null ) {
64-
final SessionOpenEvent sessionOpenEvent = (SessionOpenEvent) event;
63+
if ( monitoringEvent != null ) {
64+
final SessionOpenEvent sessionOpenEvent = (SessionOpenEvent) monitoringEvent;
6565
sessionOpenEvent.end();
6666
if ( sessionOpenEvent.shouldCommit() ) {
6767
sessionOpenEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -84,10 +84,10 @@ public SessionClosedEvent beginSessionClosedEvent() {
8484

8585
@Override
8686
public void completeSessionClosedEvent(
87-
HibernateMonitoringEvent event,
87+
HibernateMonitoringEvent monitoringEvent,
8888
SharedSessionContractImplementor session) {
89-
if ( event != null ) {
90-
final SessionClosedEvent sessionClosedEvent = (SessionClosedEvent) event;
89+
if ( monitoringEvent != null ) {
90+
final SessionClosedEvent sessionClosedEvent = (SessionClosedEvent) monitoringEvent;
9191
sessionClosedEvent.end();
9292
if ( sessionClosedEvent.shouldCommit() ) {
9393
sessionClosedEvent.sessionIdentifier = getSessionIdentifier( session );
@@ -111,11 +111,11 @@ public JdbcConnectionAcquisitionEvent beginJdbcConnectionAcquisitionEvent() {
111111

112112
@Override
113113
public void completeJdbcConnectionAcquisitionEvent(
114-
HibernateMonitoringEvent event,
114+
HibernateMonitoringEvent monitoringEvent,
115115
SharedSessionContractImplementor session,
116116
Object tenantId) {
117-
if ( event != null ) {
118-
final JdbcConnectionAcquisitionEvent jdbcConnectionAcquisitionEvent = (JdbcConnectionAcquisitionEvent) event;
117+
if ( monitoringEvent != null ) {
118+
final JdbcConnectionAcquisitionEvent jdbcConnectionAcquisitionEvent = (JdbcConnectionAcquisitionEvent) monitoringEvent;
119119
jdbcConnectionAcquisitionEvent.end();
120120
if ( jdbcConnectionAcquisitionEvent.shouldCommit() ) {
121121
jdbcConnectionAcquisitionEvent.executionTime = getExecutionTime( jdbcConnectionAcquisitionEvent.startedAt );
@@ -143,11 +143,11 @@ public JdbcConnectionReleaseEvent beginJdbcConnectionReleaseEvent() {
143143

144144
@Override
145145
public void completeJdbcConnectionReleaseEvent(
146-
HibernateMonitoringEvent event,
146+
HibernateMonitoringEvent monitoringEvent,
147147
SharedSessionContractImplementor session,
148148
Object tenantId) {
149-
if ( event != null ) {
150-
final JdbcConnectionReleaseEvent jdbcConnectionReleaseEvent = (JdbcConnectionReleaseEvent) event;
149+
if ( monitoringEvent != null ) {
150+
final JdbcConnectionReleaseEvent jdbcConnectionReleaseEvent = (JdbcConnectionReleaseEvent) monitoringEvent;
151151
jdbcConnectionReleaseEvent.end();
152152
if ( jdbcConnectionReleaseEvent.shouldCommit() ) {
153153
jdbcConnectionReleaseEvent.executionTime = getExecutionTime( jdbcConnectionReleaseEvent.startedAt );
@@ -175,10 +175,10 @@ public JdbcPreparedStatementCreationEvent beginJdbcPreparedStatementCreationEven
175175

176176
@Override
177177
public void completeJdbcPreparedStatementCreationEvent(
178-
HibernateMonitoringEvent event,
178+
HibernateMonitoringEvent monitoringEvent,
179179
String preparedStatementSql) {
180-
if ( event != null ) {
181-
final JdbcPreparedStatementCreationEvent jdbcPreparedStatementCreation = (JdbcPreparedStatementCreationEvent) event;
180+
if ( monitoringEvent != null ) {
181+
final JdbcPreparedStatementCreationEvent jdbcPreparedStatementCreation = (JdbcPreparedStatementCreationEvent) monitoringEvent;
182182
jdbcPreparedStatementCreation.end();
183183
if ( jdbcPreparedStatementCreation.shouldCommit() ) {
184184
jdbcPreparedStatementCreation.executionTime = getExecutionTime( jdbcPreparedStatementCreation.startedAt );
@@ -203,10 +203,10 @@ public JdbcPreparedStatementExecutionEvent beginJdbcPreparedStatementExecutionEv
203203

204204
@Override
205205
public void completeJdbcPreparedStatementExecutionEvent(
206-
HibernateMonitoringEvent event,
206+
HibernateMonitoringEvent monitoringEvent,
207207
String preparedStatementSql) {
208-
if ( event != null ) {
209-
final JdbcPreparedStatementExecutionEvent jdbcPreparedStatementExecutionEvent = (JdbcPreparedStatementExecutionEvent) event;
208+
if ( monitoringEvent != null ) {
209+
final JdbcPreparedStatementExecutionEvent jdbcPreparedStatementExecutionEvent = (JdbcPreparedStatementExecutionEvent) monitoringEvent;
210210
jdbcPreparedStatementExecutionEvent.end();
211211
if ( jdbcPreparedStatementExecutionEvent.shouldCommit() ) {
212212
jdbcPreparedStatementExecutionEvent.executionTime = getExecutionTime(
@@ -232,10 +232,10 @@ public JdbcBatchExecutionEvent beginJdbcBatchExecutionEvent() {
232232

233233
@Override
234234
public void completeJdbcBatchExecutionEvent(
235-
HibernateMonitoringEvent event,
235+
HibernateMonitoringEvent monitoringEvent,
236236
String statementSql) {
237-
if ( event != null ) {
238-
final JdbcBatchExecutionEvent jdbcBatchExecutionEvent = (JdbcBatchExecutionEvent) event;
237+
if ( monitoringEvent != null ) {
238+
final JdbcBatchExecutionEvent jdbcBatchExecutionEvent = (JdbcBatchExecutionEvent) monitoringEvent;
239239
jdbcBatchExecutionEvent.end();
240240
if ( jdbcBatchExecutionEvent.shouldCommit() ) {
241241
jdbcBatchExecutionEvent.executionTime = getExecutionTime( jdbcBatchExecutionEvent.startedAt );
@@ -260,13 +260,13 @@ public HibernateMonitoringEvent beginCachePutEvent() {
260260

261261
@Override
262262
public void completeCachePutEvent(
263-
HibernateMonitoringEvent event,
263+
HibernateMonitoringEvent monitoringEvent,
264264
SharedSessionContractImplementor session,
265265
Region region,
266266
boolean cacheContentChanged,
267267
CacheActionDescription description) {
268-
if ( event != null ) {
269-
final CachePutEvent cachePutEvent = (CachePutEvent) event;
268+
if ( monitoringEvent != null ) {
269+
final CachePutEvent cachePutEvent = (CachePutEvent) monitoringEvent;
270270
cachePutEvent.end();
271271
if ( cachePutEvent.shouldCommit() ) {
272272
cachePutEvent.executionTime = getExecutionTime( cachePutEvent.startedAt );
@@ -281,14 +281,14 @@ public void completeCachePutEvent(
281281

282282
@Override
283283
public void completeCachePutEvent(
284-
HibernateMonitoringEvent event,
284+
HibernateMonitoringEvent monitoringEvent,
285285
SharedSessionContractImplementor session,
286286
CachedDomainDataAccess cachedDomainDataAccess,
287287
EntityPersister persister,
288288
boolean cacheContentChanged,
289289
CacheActionDescription description) {
290290
completeCachePutEvent(
291-
event,
291+
monitoringEvent,
292292
session,
293293
cachedDomainDataAccess,
294294
persister,
@@ -300,15 +300,15 @@ public void completeCachePutEvent(
300300

301301
@Override
302302
public void completeCachePutEvent(
303-
HibernateMonitoringEvent event,
303+
HibernateMonitoringEvent monitoringEvent,
304304
SharedSessionContractImplementor session,
305305
CachedDomainDataAccess cachedDomainDataAccess,
306306
EntityPersister persister,
307307
boolean cacheContentChanged,
308308
boolean isNatualId,
309309
CacheActionDescription description) {
310-
if ( event != null ) {
311-
final CachePutEvent cachePutEvent = (CachePutEvent) event;
310+
if ( monitoringEvent != null ) {
311+
final CachePutEvent cachePutEvent = (CachePutEvent) monitoringEvent;
312312
cachePutEvent.end();
313313
if ( cachePutEvent.shouldCommit() ) {
314314
cachePutEvent.executionTime = getExecutionTime( cachePutEvent.startedAt );
@@ -325,14 +325,14 @@ public void completeCachePutEvent(
325325

326326
@Override
327327
public void completeCachePutEvent(
328-
HibernateMonitoringEvent event,
328+
HibernateMonitoringEvent monitoringEvent,
329329
SharedSessionContractImplementor session,
330330
CachedDomainDataAccess cachedDomainDataAccess,
331331
CollectionPersister persister,
332332
boolean cacheContentChanged,
333333
CacheActionDescription description) {
334-
if ( event != null ) {
335-
final CachePutEvent cachePutEvent = (CachePutEvent) event;
334+
if ( monitoringEvent != null ) {
335+
final CachePutEvent cachePutEvent = (CachePutEvent) monitoringEvent;
336336
cachePutEvent.end();
337337
if ( cachePutEvent.shouldCommit() ) {
338338
cachePutEvent.executionTime = getExecutionTime( cachePutEvent.startedAt );
@@ -361,12 +361,12 @@ public HibernateMonitoringEvent beginCacheGetEvent() {
361361

362362
@Override
363363
public void completeCacheGetEvent(
364-
HibernateMonitoringEvent event,
364+
HibernateMonitoringEvent monitoringEvent,
365365
SharedSessionContractImplementor session,
366366
Region region,
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.executionTime = getExecutionTime( cacheGetEvent.startedAt );
@@ -380,14 +380,14 @@ public void completeCacheGetEvent(
380380

381381
@Override
382382
public void completeCacheGetEvent(
383-
HibernateMonitoringEvent event,
383+
HibernateMonitoringEvent monitoringEvent,
384384
SharedSessionContractImplementor session,
385385
Region region,
386386
EntityPersister persister,
387387
boolean isNaturalKey,
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.executionTime = getExecutionTime( cacheGetEvent.startedAt );
@@ -403,13 +403,13 @@ public void completeCacheGetEvent(
403403

404404
@Override
405405
public void completeCacheGetEvent(
406-
HibernateMonitoringEvent event,
406+
HibernateMonitoringEvent monitoringEvent,
407407
SharedSessionContractImplementor session,
408408
Region region,
409409
CollectionPersister persister,
410410
boolean hit) {
411-
if ( event != null ) {
412-
final CacheGetEvent cacheGetEvent = (CacheGetEvent) event;
411+
if ( monitoringEvent != null ) {
412+
final CacheGetEvent cacheGetEvent = (CacheGetEvent) monitoringEvent;
413413
cacheGetEvent.end();
414414
if ( cacheGetEvent.shouldCommit() ) {
415415
cacheGetEvent.executionTime = getExecutionTime( cacheGetEvent.startedAt );
@@ -444,18 +444,18 @@ public void completeFlushEvent(
444444

445445
@Override
446446
public void completeFlushEvent(
447-
HibernateMonitoringEvent hibernateMonitoringEvent,
448-
org.hibernate.event.spi.FlushEvent event,
447+
HibernateMonitoringEvent monitoringEvent,
448+
org.hibernate.event.spi.FlushEvent hibernateFlushEvent,
449449
boolean autoFlush) {
450-
if ( hibernateMonitoringEvent != null ) {
451-
final FlushEvent flushEvent = (FlushEvent) hibernateMonitoringEvent;
450+
if ( monitoringEvent != null ) {
451+
final FlushEvent flushEvent = (FlushEvent) monitoringEvent;
452452
flushEvent.end();
453453
if ( flushEvent.shouldCommit() ) {
454454
flushEvent.executionTime = getExecutionTime( flushEvent.startedAt );
455-
EventSource session = event.getSession();
455+
EventSource session = hibernateFlushEvent.getSession();
456456
flushEvent.sessionIdentifier = getSessionIdentifier( session );
457-
flushEvent.numberOfEntitiesProcessed = event.getNumberOfEntitiesProcessed();
458-
flushEvent.numberOfCollectionsProcessed = event.getNumberOfCollectionsProcessed();
457+
flushEvent.numberOfEntitiesProcessed = hibernateFlushEvent.getNumberOfEntitiesProcessed();
458+
flushEvent.numberOfCollectionsProcessed = hibernateFlushEvent.getNumberOfCollectionsProcessed();
459459
flushEvent.isAutoFlush = autoFlush;
460460
flushEvent.commit();
461461
}
@@ -466,7 +466,6 @@ public void completeFlushEvent(
466466
public PartialFlushEvent beginPartialFlushEvent() {
467467
if ( partialFlushEventType.isEnabled() ) {
468468
final PartialFlushEvent partialFlushEvent = new PartialFlushEvent();
469-
partialFlushEvent.startedAt = System.nanoTime();
470469
partialFlushEvent.begin();
471470
return partialFlushEvent;
472471
}
@@ -477,10 +476,10 @@ public PartialFlushEvent beginPartialFlushEvent() {
477476

478477
@Override
479478
public void completePartialFlushEvent(
480-
HibernateMonitoringEvent hibernateMonitoringEvent,
479+
HibernateMonitoringEvent monitoringEvent,
481480
AutoFlushEvent event) {
482-
if ( event != null && hibernateMonitoringEvent != null) {
483-
final PartialFlushEvent flushEvent = (PartialFlushEvent) hibernateMonitoringEvent;
481+
if ( monitoringEvent != null) {
482+
final PartialFlushEvent flushEvent = (PartialFlushEvent) monitoringEvent;
484483
flushEvent.end();
485484
if ( flushEvent.shouldCommit() ) {
486485
flushEvent.executionTime = getExecutionTime( flushEvent.startedAt );
@@ -509,13 +508,13 @@ public DirtyCalculationEvent beginDirtyCalculationEvent() {
509508

510509
@Override
511510
public void completeDirtyCalculationEvent(
512-
HibernateMonitoringEvent event,
511+
HibernateMonitoringEvent monitoringEvent,
513512
SharedSessionContractImplementor session,
514513
EntityPersister persister,
515514
EntityEntry entry,
516515
int[] dirtyProperties) {
517-
if ( event != null ) {
518-
final DirtyCalculationEvent dirtyCalculationEvent = (DirtyCalculationEvent) event;
516+
if ( monitoringEvent != null ) {
517+
final DirtyCalculationEvent dirtyCalculationEvent = (DirtyCalculationEvent) monitoringEvent;
519518
dirtyCalculationEvent.end();
520519
if ( dirtyCalculationEvent.shouldCommit() ) {
521520
dirtyCalculationEvent.executionTime = getExecutionTime( dirtyCalculationEvent.startedAt );

0 commit comments

Comments
 (0)