HHH-10893 - Fix Reusing Query but changing collection parameters returns wrong result

hibernate-core/src/main/java/org/hibernate/engine/query/spi/NamedParameterDescriptor.java

@@ -81,4 +81,22 @@ public class NamedParameterDescriptor implements QueryParameter {
 	public Type getType() {
 		return expectedType;
 	}
+
+	@Override
+	public boolean equals(Object o) {
+		if ( this == o ) {
+			return true;
+		}
+		if ( o == null || getClass() != o.getClass() ) {
+			return false;
+		}
+
+		NamedParameterDescriptor that = (NamedParameterDescriptor) o;
+		return getName().equals( that.getName() );
+	}
+
+	@Override
+	public int hashCode() {
+		return getName().hashCode();
+	}
 }

hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java

@@ -586,9 +586,7 @@ public class QueryParameterBindingsImpl implements QueryParameterBindings {
 				);
 				final QueryParameterBinding syntheticBinding = makeBinding( entry.getValue().getBindType() );
 				syntheticBinding.setBindValue( bindValue );
-				if ( parameterBindingMap.put( syntheticParam, syntheticBinding ) != null ) {
-					throw new HibernateException( "Repeated usage of synthetic parameter name [" + syntheticName + "] while expanding list parameter." );
-				}
+				parameterBindingMap.put( syntheticParam, syntheticBinding );
 				i++;
 			}
 

hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterNamedImpl.java

@@ -49,4 +49,22 @@ public class QueryParameterNamedImpl<T> extends QueryParameterImpl<T> implements
 	public boolean isJpaPositionalParameter() {
 		return jpaStyle;
 	}
+
+	@Override
+	public boolean equals(Object o) {
+		if ( this == o ) {
+			return true;
+		}
+		if ( o == null || getClass() != o.getClass() ) {
+			return false;
+		}
+
+		QueryParameterNamedImpl<?> that = (QueryParameterNamedImpl<?>) o;
+		return getName().equals( that.getName() );
+	}
+
+	@Override
+	public int hashCode() {
+		return getName().hashCode();
+	}
 }