HHH-18069 NullPointerException when unioning partition results
This commit is contained in:
parent
9ed11194a2
commit
b6ee7918e7
|
@ -1982,9 +1982,13 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
|
||||||
sqmQueryPartStack.push( queryGroup );
|
sqmQueryPartStack.push( queryGroup );
|
||||||
pushProcessingState( processingState );
|
pushProcessingState( processingState );
|
||||||
|
|
||||||
|
FromClauseIndex firstQueryPartIndex = null;
|
||||||
|
SqlAstProcessingState firstPoppedProcessingState = null;
|
||||||
try {
|
try {
|
||||||
newQueryParts.add( visitQueryPart( queryParts.get( 0 ) ) );
|
newQueryParts.add( visitQueryPart( queryParts.get( 0 ) ) );
|
||||||
|
|
||||||
|
firstQueryPartIndex = lastPoppedFromClauseIndex;
|
||||||
|
firstPoppedProcessingState = lastPoppedProcessingState;
|
||||||
collector.setSqmAliasedNodeCollector(
|
collector.setSqmAliasedNodeCollector(
|
||||||
(SqmAliasedNodeCollector) lastPoppedProcessingState.getSqlExpressionResolver()
|
(SqmAliasedNodeCollector) lastPoppedProcessingState.getSqlExpressionResolver()
|
||||||
);
|
);
|
||||||
|
@ -2002,6 +2006,8 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
|
||||||
finally {
|
finally {
|
||||||
popProcessingStateStack();
|
popProcessingStateStack();
|
||||||
sqmQueryPartStack.pop();
|
sqmQueryPartStack.pop();
|
||||||
|
lastPoppedFromClauseIndex = firstQueryPartIndex;
|
||||||
|
lastPoppedProcessingState = firstPoppedProcessingState;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue