Use the evaluation result also when handling errors [feenkcom/gtoolki…

…t#3942]
feenkcom · Aug 20, 2024 · d87666b · d87666b
1 parent 7337af7
commit d87666b
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/GToolkit-GemStone-Pharo/GtRsrEvaluatorPromise.class.st b/src/GToolkit-GemStone-Pharo/GtRsrEvaluatorPromise.class.st
@@ -141,21 +141,22 @@ GtRsrEvaluatorPromise >> setPromise: aPromise strategy: aSymbol session: aSessio
 { #category : #accessing }
 GtRsrEvaluatorPromise >> signalGemStoneDebugger [
 	<gemstoneDebuggerSignal>
-	| exception result |
+	| exception rawEvaluationResultData evaluationResult |
 
-	self isGtEvaluationException ifFalse:
-		[ self error: 'not a gs exception' ].
+	self isGtEvaluationException ifFalse: [ 
+		self error: 'not a gs exception' ].
 
-	result := rsrPromise value.
-	result gtPharoProxyInitializeWithSession: gtSession.
+	rawEvaluationResultData := rsrPromise value.
+	evaluationResult := self createEvaluationResultFromData: rawEvaluationResultData.
+	evaluationResult gtPharoProxyInitializeWithSession: gtSession.
 
 	exception := GtRsrEvaluationException new 
-		debuggerProxy: result.
+		debuggerProxy: evaluationResult evaluationContext.
 	exception signal.
 
 	^ exception hasDebugResult
 		ifTrue: [ exception debugResult ]
-		ifFalse: [ result ]
+		ifFalse: [ rawEvaluationResultData ]
 ]
 
 { #category : #accessing }