Fix restart frame handler

adpi2 · adpi2 · commit be72edb3de54 · 2022-10-04T14:38:45.000+02:00
StepRequest should be deleted after we receive its corresponding
debug event
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/RestartFrameHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/RestartFrameHandler.java
@@ -32,6 +32,7 @@
 import com.microsoft.java.debug.core.protocol.Requests.RestartFrameArguments;
 import com.sun.jdi.StackFrame;
 import com.sun.jdi.ThreadReference;
+import com.sun.jdi.request.EventRequestManager;
 import com.sun.jdi.request.StepRequest;
 
 /**
@@ -102,8 +103,10 @@ private void popStackFrames(IDebugAdapterContext context, ThreadReference thread
     }
 
     private void stepInto(IDebugAdapterContext context, ThreadReference thread) {
+        EventRequestManager manager = context.getDebugSession().getVM().eventRequestManager();
         StepRequest request = DebugUtility.createStepIntoRequest(thread, context.getStepFilters().allowClasses, context.getStepFilters().skipClasses);
         context.getDebugSession().getEventHub().stepEvents().filter(debugEvent -> request.equals(debugEvent.event.request())).take(1).subscribe(debugEvent -> {
+            DebugUtility.deleteEventRequestSafely(manager, request);
             debugEvent.shouldResume = false;
             // Have to send two events to keep the UI sync with the step in operations:
             context.getProtocolServer().sendEvent(new Events.ContinuedEvent(thread.uniqueID()));
