HHH-18770 Check if the monitoring event was null
This commit is contained in:
parent
46cb14089b
commit
412bfed842
|
@ -54,10 +54,10 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@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 );
|
||||
|
@ -80,10 +80,10 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@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 );
|
||||
|
@ -106,11 +106,11 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@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.sessionIdentifier = getSessionIdentifier( session );
|
||||
|
@ -136,11 +136,11 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@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.sessionIdentifier = getSessionIdentifier( session );
|
||||
|
@ -166,10 +166,10 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@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.sql = preparedStatementSql;
|
||||
|
@ -192,10 +192,10 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@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.sql = preparedStatementSql;
|
||||
|
@ -218,10 +218,10 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@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.sql = statementSql;
|
||||
|
@ -244,13 +244,13 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@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.sessionIdentifier = getSessionIdentifier( session );
|
||||
|
@ -264,14 +264,14 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@Override
|
||||
public void completeCachePutEvent(
|
||||
HibernateMonitoringEvent event,
|
||||
HibernateMonitoringEvent monitoringEvent,
|
||||
SharedSessionContractImplementor session,
|
||||
CachedDomainDataAccess cachedDomainDataAccess,
|
||||
EntityPersister persister,
|
||||
boolean cacheContentChanged,
|
||||
CacheActionDescription description) {
|
||||
completeCachePutEvent(
|
||||
event,
|
||||
monitoringEvent,
|
||||
session,
|
||||
cachedDomainDataAccess,
|
||||
persister,
|
||||
|
@ -283,15 +283,15 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@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.sessionIdentifier = getSessionIdentifier( session );
|
||||
|
@ -307,14 +307,14 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@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.sessionIdentifier = getSessionIdentifier( session );
|
||||
|
@ -341,12 +341,12 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@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.sessionIdentifier = getSessionIdentifier( session );
|
||||
|
@ -359,14 +359,14 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@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.sessionIdentifier = getSessionIdentifier( session );
|
||||
|
@ -381,13 +381,13 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@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.sessionIdentifier = getSessionIdentifier( session );
|
||||
|
@ -420,18 +420,18 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@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;
|
||||
flushEvent.end();
|
||||
if ( flushEvent.shouldCommit() ) {
|
||||
flushEvent.sessionIdentifier = getSessionIdentifier( event.getSession() );
|
||||
flushEvent.numberOfEntitiesProcessed = event.getNumberOfEntitiesProcessed();
|
||||
flushEvent.numberOfCollectionsProcessed = event.getNumberOfCollectionsProcessed();
|
||||
flushEvent.isAutoFlush = autoFlush;
|
||||
flushEvent.commit();
|
||||
if ( monitoringEvent != null ) {
|
||||
final FlushEvent jfrFlushEvent = (FlushEvent) monitoringEvent;
|
||||
jfrFlushEvent.end();
|
||||
if ( jfrFlushEvent.shouldCommit() ) {
|
||||
jfrFlushEvent.sessionIdentifier = getSessionIdentifier( hibernateFlushEvent.getSession() );
|
||||
jfrFlushEvent.numberOfEntitiesProcessed = hibernateFlushEvent.getNumberOfEntitiesProcessed();
|
||||
jfrFlushEvent.numberOfCollectionsProcessed = hibernateFlushEvent.getNumberOfCollectionsProcessed();
|
||||
jfrFlushEvent.isAutoFlush = autoFlush;
|
||||
jfrFlushEvent.commit();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -450,17 +450,17 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@Override
|
||||
public void completePartialFlushEvent(
|
||||
HibernateMonitoringEvent hibernateMonitoringEvent,
|
||||
AutoFlushEvent event) {
|
||||
if ( event != null && hibernateMonitoringEvent != null) {
|
||||
final PartialFlushEvent flushEvent = (PartialFlushEvent) hibernateMonitoringEvent;
|
||||
flushEvent.end();
|
||||
if ( flushEvent.shouldCommit() ) {
|
||||
flushEvent.sessionIdentifier = getSessionIdentifier( event.getSession() );
|
||||
flushEvent.numberOfEntitiesProcessed = event.getNumberOfEntitiesProcessed();
|
||||
flushEvent.numberOfCollectionsProcessed = event.getNumberOfCollectionsProcessed();
|
||||
flushEvent.isAutoFlush = true;
|
||||
flushEvent.commit();
|
||||
HibernateMonitoringEvent monitoringEvent,
|
||||
AutoFlushEvent hibernateAutoFlushEvent) {
|
||||
if ( monitoringEvent != null) {
|
||||
final PartialFlushEvent jfrPartialFlushEvent = (PartialFlushEvent) monitoringEvent;
|
||||
jfrPartialFlushEvent.end();
|
||||
if ( jfrPartialFlushEvent.shouldCommit() ) {
|
||||
jfrPartialFlushEvent.sessionIdentifier = getSessionIdentifier( hibernateAutoFlushEvent.getSession() );
|
||||
jfrPartialFlushEvent.numberOfEntitiesProcessed = hibernateAutoFlushEvent.getNumberOfEntitiesProcessed();
|
||||
jfrPartialFlushEvent.numberOfCollectionsProcessed = hibernateAutoFlushEvent.getNumberOfCollectionsProcessed();
|
||||
jfrPartialFlushEvent.isAutoFlush = true;
|
||||
jfrPartialFlushEvent.commit();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -479,13 +479,13 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@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.sessionIdentifier = getSessionIdentifier( session );
|
||||
|
@ -511,10 +511,10 @@ public class JfrEventManager implements EventManager {
|
|||
|
||||
@Override
|
||||
public void completePrePartialFlush(
|
||||
HibernateMonitoringEvent event,
|
||||
HibernateMonitoringEvent monitoringEvent,
|
||||
SharedSessionContractImplementor session) {
|
||||
if ( event != null ) {
|
||||
final PrePartialFlushEvent prePartialFlushEvent = (PrePartialFlushEvent) event;
|
||||
if ( monitoringEvent != null ) {
|
||||
final PrePartialFlushEvent prePartialFlushEvent = (PrePartialFlushEvent) monitoringEvent;
|
||||
prePartialFlushEvent.end();
|
||||
if ( prePartialFlushEvent.shouldCommit() ) {
|
||||
prePartialFlushEvent.sessionIdentifier = getSessionIdentifier( session );
|
||||
|
|
Loading…
Reference in New Issue