From 0985ddecc4e16261825b629a4f8a7dc18418d03e Mon Sep 17 00:00:00 2001
From: Christian Beikov <christian.beikov@gmail.com>
Date: Thu, 23 May 2024 20:03:32 +0200
Subject: [PATCH] HHH-18027 Clear expansions NonSelectQueryPlan.executeUpdate
 call

---
 .../org/hibernate/query/sqm/internal/QuerySqmImpl.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java
index 4bbd13d399..a4372fa87c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java
@@ -663,7 +663,12 @@ public class QuerySqmImpl<R>
 	}
 
 	protected int doExecuteUpdate() {
-		return resolveNonSelectQueryPlan().executeUpdate( this );
+		try {
+			return resolveNonSelectQueryPlan().executeUpdate( this );
+		}
+		finally {
+			domainParameterXref.clearExpansions();
+		}
 	}
 
 	private NonSelectQueryPlan resolveNonSelectQueryPlan() {