From a85c42fca5fb4f517e42517ce10e42ff7992c15f Mon Sep 17 00:00:00 2001
From: andxu <andxu@microsoft.com>
Date: Thu, 27 Sep 2018 11:02:11 +0800
Subject: [PATCH] fix the InvalidStackFrameException

---
 .../core/adapter/handler/SetBreakpointsRequestHandler.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetBreakpointsRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetBreakpointsRequestHandler.java
index 3eeb4b460..ca2a002c9 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetBreakpointsRequestHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetBreakpointsRequestHandler.java
@@ -193,11 +193,12 @@ private void registerBreakpointHandler(IDebugAdapterContext context) {
                         CompletableFuture.runAsync(() -> {
                             engine.evaluateForBreakpoint((IEvaluatableBreakpoint) expressionBP, bpThread).whenComplete((value, ex) -> {
                                 boolean resume = handleEvaluationResult(context, bpThread, expressionBP, value, ex);
+                                // Clear the evaluation environment caused by above evaluation.
+                                engine.clearState(bpThread);
+
                                 if (resume) {
                                     debugEvent.eventSet.resume();
                                 }
-                                // Clear the evaluation environment caused by above evaluation.
-                                engine.clearState(bpThread);
                             });
                         });
                     } else {