HHH-19038 - Move the evaluation of the session validity in AbstractPersistentCollection before actually dereferencing it

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java

@@ -177,9 +177,6 @@ protected boolean readSize() {
 									read();
 								}
 							}
-							else {
-								throwLazyInitializationExceptionIfNotConnected();
-							}
 							return false;
 						}
 				);
@@ -193,9 +190,9 @@ public int getSize() {
 			return cachedSize;
 		}
 		else {
+			throwLazyInitializationExceptionIfNotConnected();
 			final var entry = getCollectionEntry();
 			if ( entry == null ) {
-				throwLazyInitializationExceptionIfNotConnected();
 				throwLazyInitializationException( "collection not associated with session" );
 				throw new AssertionFailure( "impossible" );
 			}
@@ -373,9 +370,9 @@ protected Boolean readElementExistence(final Object element) {
 
 	@Override
 	public boolean elementExists(Object element) {
+		throwLazyInitializationExceptionIfNotConnected();
 		final var entry = getCollectionEntry();
 		if ( entry == null ) {
-			throwLazyInitializationExceptionIfNotConnected();
 			throwLazyInitializationException( "collection not associated with session" );
 			throw new AssertionFailure( "impossible" );
 		}
@@ -413,9 +410,9 @@ protected Object readElementByIndex(final Object index) {
 
 	@Override
 	public Object elementByIndex(Object index) {
+		throwLazyInitializationExceptionIfNotConnected();
 		final var entry = getCollectionEntry();
 		if ( entry == null ) {
-			throwLazyInitializationExceptionIfNotConnected();
 			throwLazyInitializationException( "collection not associated with session" );
 			throw new AssertionFailure( "impossible" );
 		}