HHH-19818 Check whether to generate revision early and without CollectionEntry

Author: beikov

hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostCollectionRecreateEventListenerImpl.java

@@ -27,12 +27,14 @@ public EnversPostCollectionRecreateEventListenerImpl(EnversService enversService
 
 	@Override
 	public void onPostRecreateCollection(PostCollectionRecreateEvent event) {
-		final CollectionEntry collectionEntry = getCollectionEntry( event );
-		if ( !collectionEntry.getLoadedPersister().isInverse() ) {
-			onCollectionAction( event, event.getCollection(), null, collectionEntry );
-		}
-		else {
-			onCollectionActionInversed( event, event.getCollection(), null, collectionEntry );
+		if ( shouldGenerateRevision( event ) ) {
+			final CollectionEntry collectionEntry = getCollectionEntry( event );
+			if ( !collectionEntry.getLoadedPersister().isInverse() ) {
+				onCollectionAction( event, event.getCollection(), null, collectionEntry );
+			}
+			else {
+				onCollectionActionInversed( event, event.getCollection(), null, collectionEntry );
+			}
 		}
 	}
 }

hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionRemoveEventListenerImpl.java

@@ -30,20 +30,22 @@ public EnversPreCollectionRemoveEventListenerImpl(EnversService enversService) {
 
 	@Override
 	public void onPreRemoveCollection(PreCollectionRemoveEvent event) {
-		final CollectionEntry collectionEntry = getCollectionEntry( event );
-		if ( collectionEntry != null ) {
-			if ( !collectionEntry.getLoadedPersister().isInverse() ) {
-				Serializable oldColl = collectionEntry.getSnapshot();
-				if ( !event.getCollection().wasInitialized() && shouldGenerateRevision( event ) ) {
-					// In case of uninitialized collection we need a fresh snapshot to properly calculate audit data.
-					oldColl = initializeCollection( event );
+		if ( shouldGenerateRevision( event ) ) {
+			final CollectionEntry collectionEntry = getCollectionEntry( event );
+			if ( collectionEntry != null ) {
+				if ( !collectionEntry.getLoadedPersister().isInverse() ) {
+					Serializable oldColl = collectionEntry.getSnapshot();
+					if ( !event.getCollection().wasInitialized() && shouldGenerateRevision( event ) ) {
+						// In case of uninitialized collection we need a fresh snapshot to properly calculate audit data.
+						oldColl = initializeCollection( event );
+					}
+					onCollectionAction( event, null, oldColl, collectionEntry );
 				}
-				onCollectionAction( event, null, oldColl, collectionEntry );
-			}
-			else {
-				// HHH-7510 - Avoid LazyInitializationException when global_with_modified_flag = true
-				if ( getEnversService().getConfig().isModifiedFlagsEnabled() ) {
-					initializeCollection( event );
+				else {
+					// HHH-7510 - Avoid LazyInitializationException when global_with_modified_flag = true
+					if ( getEnversService().getConfig().isModifiedFlagsEnabled() ) {
+						initializeCollection( event );
+					}
 				}
 			}
 		}

hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionUpdateEventListenerImpl.java

@@ -27,12 +27,15 @@ public EnversPreCollectionUpdateEventListenerImpl(EnversService enversService) {
 
 	@Override
 	public void onPreUpdateCollection(PreCollectionUpdateEvent event) {
-		final CollectionEntry collectionEntry = getCollectionEntry( event );
-		if ( !collectionEntry.getLoadedPersister().isInverse() ) {
-			onCollectionAction( event, event.getCollection(), collectionEntry.getSnapshot(), collectionEntry );
-		}
-		else {
-			onCollectionActionInversed( event, event.getCollection(), collectionEntry.getSnapshot(), collectionEntry );
+		if ( shouldGenerateRevision( event ) ) {
+			final CollectionEntry collectionEntry = getCollectionEntry( event );
+			if ( !collectionEntry.getLoadedPersister().isInverse() ) {
+				onCollectionAction( event, event.getCollection(), collectionEntry.getSnapshot(), collectionEntry );
+			}
+			else {
+				onCollectionActionInversed( event, event.getCollection(), collectionEntry.getSnapshot(),
+						collectionEntry );
+			}
 		}
 	}
 }