HHH-19047 Prevent GC nepotism from affecting StandardStack

hibernate · Jan 17, 2025 · d71a2e5 · d71a2e5
1 parent 88d689e
commit d71a2e5
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/StandardStack.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/StandardStack.java
@@ -19,6 +19,7 @@
  * @author Sanne Grinovero
  * @author Marco Belladelli
  */
+@SuppressWarnings("unchecked")
 public final class StandardStack<T> implements Stack<T> {
 
 	private Object[] elements;
@@ -107,8 +108,8 @@ public boolean isEmpty() {
 
 	@Override
 	public void clear() {
-		for ( int i = 0; i < top; i++ ) {
-			elements[i] = null;
+		if ( elements != null ) {
+			Arrays.fill( elements, 0, top, null );
 		}
 		top = 0;
 	}
@@ -145,7 +146,10 @@ public <X, Y> X findCurrentFirstWithParameter(Y parameter, BiFunction<T, Y, X> b
 	private void grow() {
 		final int oldCapacity = elements.length;
 		final int jump = ( oldCapacity < 64 ) ? ( oldCapacity + 2 ) : ( oldCapacity >> 1 );
-		elements = Arrays.copyOf( elements, oldCapacity + jump );
+		final Object[] newElements = Arrays.copyOf( elements, oldCapacity + jump );
+		// Prevents GC nepotism on the old array elements, see HHH-19047
+		Arrays.fill( elements, null );
+		elements = newElements;
 	}
 
 }