fixed concurrency problem uncovered during JMH-based throughput testing (Act 4 - which is really Act 2)

2019-11-21 22:04:22 -06:00 · 2019-11-21 22:04:22 -06:00 · ecfb3da071
parent 2b65c73fb7
commit ecfb3da071
1 changed files with 2 additions and 1 deletions
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java
@ -188,11 +188,12 @@ public class ConcreteSqmSelectQueryPlan<R> implements SelectQueryPlan<R> {
 			synchronized ( this ) {
 				localCopy = cacheableSqmInterpretation;
 				if ( localCopy == null ) {
-					cacheableSqmInterpretation = localCopy = buildCacheableSqmInterpretation(
+					localCopy = buildCacheableSqmInterpretation(
 							sqm,
 							domainParameterXref,
 							executionContext
 					);
+					cacheableSqmInterpretation = localCopy;
 				}
 			}
 		}