Skip to content

Commit

Permalink
HHH-18770 Check if the monitoring event was null
Browse files Browse the repository at this point in the history
  • Loading branch information
@dreab8
dreab8 committed Oct 29, 2024
1 parent ee786bd commit a414bf3
Showing 1 changed file with 54 additions and 55 deletions.
109 changes: 54 additions & 55 deletions hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JfrEventManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ public SessionOpenEvent beginSessionOpenEvent() {

@Override
public void completeSessionOpenEvent(
HibernateMonitoringEvent event,
HibernateMonitoringEvent monitoringEvent,
SharedSessionContractImplementor session) {
if ( event != null ) {
final SessionOpenEvent sessionOpenEvent = (SessionOpenEvent) event;
if ( monitoringEvent != null ) {
final SessionOpenEvent sessionOpenEvent = (SessionOpenEvent) monitoringEvent;
sessionOpenEvent.end();
if ( sessionOpenEvent.shouldCommit() ) {
sessionOpenEvent.sessionIdentifier = getSessionIdentifier( session );
Expand All @@ -84,10 +84,10 @@ public SessionClosedEvent beginSessionClosedEvent() {

@Override
public void completeSessionClosedEvent(
HibernateMonitoringEvent event,
HibernateMonitoringEvent monitoringEvent,
SharedSessionContractImplementor session) {
if ( event != null ) {
final SessionClosedEvent sessionClosedEvent = (SessionClosedEvent) event;
if ( monitoringEvent != null ) {
final SessionClosedEvent sessionClosedEvent = (SessionClosedEvent) monitoringEvent;
sessionClosedEvent.end();
if ( sessionClosedEvent.shouldCommit() ) {
sessionClosedEvent.sessionIdentifier = getSessionIdentifier( session );
Expand All @@ -111,11 +111,11 @@ public JdbcConnectionAcquisitionEvent beginJdbcConnectionAcquisitionEvent() {

@Override
public void completeJdbcConnectionAcquisitionEvent(
HibernateMonitoringEvent event,
HibernateMonitoringEvent monitoringEvent,
SharedSessionContractImplementor session,
Object tenantId) {
if ( event != null ) {
final JdbcConnectionAcquisitionEvent jdbcConnectionAcquisitionEvent = (JdbcConnectionAcquisitionEvent) event;
if ( monitoringEvent != null ) {
final JdbcConnectionAcquisitionEvent jdbcConnectionAcquisitionEvent = (JdbcConnectionAcquisitionEvent) monitoringEvent;
jdbcConnectionAcquisitionEvent.end();
if ( jdbcConnectionAcquisitionEvent.shouldCommit() ) {
jdbcConnectionAcquisitionEvent.executionTime = getExecutionTime( jdbcConnectionAcquisitionEvent.startedAt );
Expand Down Expand Up @@ -143,11 +143,11 @@ public JdbcConnectionReleaseEvent beginJdbcConnectionReleaseEvent() {

@Override
public void completeJdbcConnectionReleaseEvent(
HibernateMonitoringEvent event,
HibernateMonitoringEvent monitoringEvent,
SharedSessionContractImplementor session,
Object tenantId) {
if ( event != null ) {
final JdbcConnectionReleaseEvent jdbcConnectionReleaseEvent = (JdbcConnectionReleaseEvent) event;
if ( monitoringEvent != null ) {
final JdbcConnectionReleaseEvent jdbcConnectionReleaseEvent = (JdbcConnectionReleaseEvent) monitoringEvent;
jdbcConnectionReleaseEvent.end();
if ( jdbcConnectionReleaseEvent.shouldCommit() ) {
jdbcConnectionReleaseEvent.executionTime = getExecutionTime( jdbcConnectionReleaseEvent.startedAt );
Expand Down Expand Up @@ -175,10 +175,10 @@ public JdbcPreparedStatementCreationEvent beginJdbcPreparedStatementCreationEven

@Override
public void completeJdbcPreparedStatementCreationEvent(
HibernateMonitoringEvent event,
HibernateMonitoringEvent monitoringEvent,
String preparedStatementSql) {
if ( event != null ) {
final JdbcPreparedStatementCreationEvent jdbcPreparedStatementCreation = (JdbcPreparedStatementCreationEvent) event;
if ( monitoringEvent != null ) {
final JdbcPreparedStatementCreationEvent jdbcPreparedStatementCreation = (JdbcPreparedStatementCreationEvent) monitoringEvent;
jdbcPreparedStatementCreation.end();
if ( jdbcPreparedStatementCreation.shouldCommit() ) {
jdbcPreparedStatementCreation.executionTime = getExecutionTime( jdbcPreparedStatementCreation.startedAt );
Expand All @@ -203,10 +203,10 @@ public JdbcPreparedStatementExecutionEvent beginJdbcPreparedStatementExecutionEv

@Override
public void completeJdbcPreparedStatementExecutionEvent(
HibernateMonitoringEvent event,
HibernateMonitoringEvent monitoringEvent,
String preparedStatementSql) {
if ( event != null ) {
final JdbcPreparedStatementExecutionEvent jdbcPreparedStatementExecutionEvent = (JdbcPreparedStatementExecutionEvent) event;
if ( monitoringEvent != null ) {
final JdbcPreparedStatementExecutionEvent jdbcPreparedStatementExecutionEvent = (JdbcPreparedStatementExecutionEvent) monitoringEvent;
jdbcPreparedStatementExecutionEvent.end();
if ( jdbcPreparedStatementExecutionEvent.shouldCommit() ) {
jdbcPreparedStatementExecutionEvent.executionTime = getExecutionTime(
Expand All @@ -232,10 +232,10 @@ public JdbcBatchExecutionEvent beginJdbcBatchExecutionEvent() {

@Override
public void completeJdbcBatchExecutionEvent(
HibernateMonitoringEvent event,
HibernateMonitoringEvent monitoringEvent,
String statementSql) {
if ( event != null ) {
final JdbcBatchExecutionEvent jdbcBatchExecutionEvent = (JdbcBatchExecutionEvent) event;
if ( monitoringEvent != null ) {
final JdbcBatchExecutionEvent jdbcBatchExecutionEvent = (JdbcBatchExecutionEvent) monitoringEvent;
jdbcBatchExecutionEvent.end();
if ( jdbcBatchExecutionEvent.shouldCommit() ) {
jdbcBatchExecutionEvent.executionTime = getExecutionTime( jdbcBatchExecutionEvent.startedAt );
Expand All @@ -260,13 +260,13 @@ public HibernateMonitoringEvent beginCachePutEvent() {

@Override
public void completeCachePutEvent(
HibernateMonitoringEvent event,
HibernateMonitoringEvent monitoringEvent,
SharedSessionContractImplementor session,
Region region,
boolean cacheContentChanged,
CacheActionDescription description) {
if ( event != null ) {
final CachePutEvent cachePutEvent = (CachePutEvent) event;
if ( monitoringEvent != null ) {
final CachePutEvent cachePutEvent = (CachePutEvent) monitoringEvent;
cachePutEvent.end();
if ( cachePutEvent.shouldCommit() ) {
cachePutEvent.executionTime = getExecutionTime( cachePutEvent.startedAt );
Expand All @@ -281,14 +281,14 @@ public void completeCachePutEvent(

@Override
public void completeCachePutEvent(
HibernateMonitoringEvent event,
HibernateMonitoringEvent monitoringEvent,
SharedSessionContractImplementor session,
CachedDomainDataAccess cachedDomainDataAccess,
EntityPersister persister,
boolean cacheContentChanged,
CacheActionDescription description) {
completeCachePutEvent(
event,
monitoringEvent,
session,
cachedDomainDataAccess,
persister,
Expand All @@ -300,15 +300,15 @@ public void completeCachePutEvent(

@Override
public void completeCachePutEvent(
HibernateMonitoringEvent event,
HibernateMonitoringEvent monitoringEvent,
SharedSessionContractImplementor session,
CachedDomainDataAccess cachedDomainDataAccess,
EntityPersister persister,
boolean cacheContentChanged,
boolean isNatualId,
CacheActionDescription description) {
if ( event != null ) {
final CachePutEvent cachePutEvent = (CachePutEvent) event;
if ( monitoringEvent != null ) {
final CachePutEvent cachePutEvent = (CachePutEvent) monitoringEvent;
cachePutEvent.end();
if ( cachePutEvent.shouldCommit() ) {
cachePutEvent.executionTime = getExecutionTime( cachePutEvent.startedAt );
Expand All @@ -325,14 +325,14 @@ public void completeCachePutEvent(

@Override
public void completeCachePutEvent(
HibernateMonitoringEvent event,
HibernateMonitoringEvent monitoringEvent,
SharedSessionContractImplementor session,
CachedDomainDataAccess cachedDomainDataAccess,
CollectionPersister persister,
boolean cacheContentChanged,
CacheActionDescription description) {
if ( event != null ) {
final CachePutEvent cachePutEvent = (CachePutEvent) event;
if ( monitoringEvent != null ) {
final CachePutEvent cachePutEvent = (CachePutEvent) monitoringEvent;
cachePutEvent.end();
if ( cachePutEvent.shouldCommit() ) {
cachePutEvent.executionTime = getExecutionTime( cachePutEvent.startedAt );
Expand Down Expand Up @@ -361,12 +361,12 @@ public HibernateMonitoringEvent beginCacheGetEvent() {

@Override
public void completeCacheGetEvent(
HibernateMonitoringEvent event,
HibernateMonitoringEvent monitoringEvent,
SharedSessionContractImplementor session,
Region region,
boolean hit) {
if ( event != null ) {
final CacheGetEvent cacheGetEvent = (CacheGetEvent) event;
if ( monitoringEvent != null ) {
final CacheGetEvent cacheGetEvent = (CacheGetEvent) monitoringEvent;
cacheGetEvent.end();
if ( cacheGetEvent.shouldCommit() ) {
cacheGetEvent.executionTime = getExecutionTime( cacheGetEvent.startedAt );
Expand All @@ -380,14 +380,14 @@ public void completeCacheGetEvent(

@Override
public void completeCacheGetEvent(
HibernateMonitoringEvent event,
HibernateMonitoringEvent monitoringEvent,
SharedSessionContractImplementor session,
Region region,
EntityPersister persister,
boolean isNaturalKey,
boolean hit) {
if ( event != null ) {
final CacheGetEvent cacheGetEvent = (CacheGetEvent) event;
if ( monitoringEvent != null ) {
final CacheGetEvent cacheGetEvent = (CacheGetEvent) monitoringEvent;
cacheGetEvent.end();
if ( cacheGetEvent.shouldCommit() ) {
cacheGetEvent.executionTime = getExecutionTime( cacheGetEvent.startedAt );
Expand All @@ -403,13 +403,13 @@ public void completeCacheGetEvent(

@Override
public void completeCacheGetEvent(
HibernateMonitoringEvent event,
HibernateMonitoringEvent monitoringEvent,
SharedSessionContractImplementor session,
Region region,
CollectionPersister persister,
boolean hit) {
if ( event != null ) {
final CacheGetEvent cacheGetEvent = (CacheGetEvent) event;
if ( monitoringEvent != null ) {
final CacheGetEvent cacheGetEvent = (CacheGetEvent) monitoringEvent;
cacheGetEvent.end();
if ( cacheGetEvent.shouldCommit() ) {
cacheGetEvent.executionTime = getExecutionTime( cacheGetEvent.startedAt );
Expand Down Expand Up @@ -444,18 +444,18 @@ public void completeFlushEvent(

@Override
public void completeFlushEvent(
HibernateMonitoringEvent hibernateMonitoringEvent,
org.hibernate.event.spi.FlushEvent event,
HibernateMonitoringEvent monitoringEvent,
org.hibernate.event.spi.FlushEvent hibernateFlushEvent,
boolean autoFlush) {
if ( hibernateMonitoringEvent != null ) {
final FlushEvent flushEvent = (FlushEvent) hibernateMonitoringEvent;
if ( monitoringEvent != null ) {
final FlushEvent flushEvent = (FlushEvent) monitoringEvent;
flushEvent.end();
if ( flushEvent.shouldCommit() ) {
flushEvent.executionTime = getExecutionTime( flushEvent.startedAt );
EventSource session = event.getSession();
EventSource session = hibernateFlushEvent.getSession();
flushEvent.sessionIdentifier = getSessionIdentifier( session );
flushEvent.numberOfEntitiesProcessed = event.getNumberOfEntitiesProcessed();
flushEvent.numberOfCollectionsProcessed = event.getNumberOfCollectionsProcessed();
flushEvent.numberOfEntitiesProcessed = hibernateFlushEvent.getNumberOfEntitiesProcessed();
flushEvent.numberOfCollectionsProcessed = hibernateFlushEvent.getNumberOfCollectionsProcessed();
flushEvent.isAutoFlush = autoFlush;
flushEvent.commit();
}
Expand All @@ -466,7 +466,6 @@ public void completeFlushEvent(
public PartialFlushEvent beginPartialFlushEvent() {
if ( partialFlushEventType.isEnabled() ) {
final PartialFlushEvent partialFlushEvent = new PartialFlushEvent();
partialFlushEvent.startedAt = System.nanoTime();
partialFlushEvent.begin();
return partialFlushEvent;
}
Expand All @@ -477,10 +476,10 @@ public PartialFlushEvent beginPartialFlushEvent() {

@Override
public void completePartialFlushEvent(
HibernateMonitoringEvent hibernateMonitoringEvent,
HibernateMonitoringEvent monitoringEvent,
AutoFlushEvent event) {
if ( event != null && hibernateMonitoringEvent != null) {
final PartialFlushEvent flushEvent = (PartialFlushEvent) hibernateMonitoringEvent;
if ( monitoringEvent != null) {
final PartialFlushEvent flushEvent = (PartialFlushEvent) monitoringEvent;
flushEvent.end();
if ( flushEvent.shouldCommit() ) {
flushEvent.executionTime = getExecutionTime( flushEvent.startedAt );
Expand Down Expand Up @@ -509,13 +508,13 @@ public DirtyCalculationEvent beginDirtyCalculationEvent() {

@Override
public void completeDirtyCalculationEvent(
HibernateMonitoringEvent event,
HibernateMonitoringEvent monitoringEvent,
SharedSessionContractImplementor session,
EntityPersister persister,
EntityEntry entry,
int[] dirtyProperties) {
if ( event != null ) {
final DirtyCalculationEvent dirtyCalculationEvent = (DirtyCalculationEvent) event;
if ( monitoringEvent != null ) {
final DirtyCalculationEvent dirtyCalculationEvent = (DirtyCalculationEvent) monitoringEvent;
dirtyCalculationEvent.end();
if ( dirtyCalculationEvent.shouldCommit() ) {
dirtyCalculationEvent.executionTime = getExecutionTime( dirtyCalculationEvent.startedAt );
Expand Down

0 comments on commit a414bf3

Please sign in to comment.