remove com.sun.jdi.VMDisconnectedException from reasonable places. (microsoft#104)

andxu · web-flow · commit 55e29be152b5 · 2017-12-04T18:32:23.000-08:00
* add logs for attaching errors.

* fix the user error log entry:
org.eclipse.jdi.internal.connect.PacketSendManagersendPacket at PacketSendManager.java Line 90
        org.eclipse.jdi.internal.MirrorImplrequestVM at MirrorImpl.java Line 187
        org.eclipse.jdi.internal.MirrorImplrequestVM at MirrorImpl.java Line 268
        org.eclipse.jdi.internal.VirtualMachineImplgetIDSizes at VirtualMachineImpl.java Line 984
        org.eclipse.jdi.internal.VirtualMachineImplpacketSendManager at VirtualMachineImpl.java Line 343
        org.eclipse.jdi.internal.MirrorImplrequestVM at MirrorImpl.java Line 187
        org.eclipse.jdi.internal.MirrorImplrequestVM at MirrorImpl.java Line 268
        org.eclipse.jdi.internal.VirtualMachineImplgetVersionInfo at VirtualMachineImpl.java Line 1010
        org.eclipse.jdi.internal.VirtualMachineImplversion at VirtualMachineImpl.java Line 939
        com.microsoft.java.debug.core.adapter.handler.AttachRequestHandlerhandle at AttachRequestHandler.java Line 65
        com.microsoft.java.debug.core.adapter.DebugAdapterdispatchRequest at DebugAdapter.java Line 80
        com.microsoft.java.debug.core.adapter.ProtocolServerdispatchRequest at ProtocolServer.java Line 66
        com.microsoft.java.debug.core.protocol.AbstractProtocolServerprocessData at AbstractProtocolServer.java Line 166
        com.microsoft.java.debug.core.protocol.AbstractProtocolServerstart at AbstractProtocolServer.java Line 80
        com.microsoft.java.debug.core.adapter.ProtocolServerstart at ProtocolServer.java Line 53
        com.microsoft.java.debug.plugin.internal.JavaDebugServer$2run at JavaDebugServer.java Line 136
        java.util.concurrent.Executors$RunnableAdaptercall at Executors.java Line 514
        java.util.concurrent.FutureTaskrun at FutureTask.java Line 264
        java.util.concurrent.ThreadPoolExecutorrunWorker at ThreadPoolExecutor.java Line 1167
        java.util.concurrent.ThreadPoolExecutor$Workerrun at ThreadPoolExecutor.java Line 641
        java.lang.Threadrun at Thread.java Line 844

* In attach scenario, the remote JVM may be already terminated before ConfigurationDone request.

* Avoid to pop up error message to users for vm terminated exception when debug session is actually useless after jvm terminates.

* revert changes to handlers.

* Remove error notifications to vscode when VMDisconnectedException is happening, since it is normal to have received terminated message during process vscode requests, return an empty response since the debug session is terminated.

* fix typo

* Merge remote-tracking branch 'origin' into andy_log_attach

# Conflicts:
#	com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/DebugAdapter.java
#	com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ThreadsRequestHandler.java

* merge with async response change for handling VMDisconnectedException

* set valid success to VMDisconnectedException

* Update ProtocolServer.java

* replace complex logic on whenComplete

* Merge remote-tracking branch 'origin' into andy_log_attach

# Conflicts:
#	com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ProtocolServer.java
#	com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ThreadsRequestHandler.java
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/Breakpoint.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/Breakpoint.java
@@ -66,7 +66,11 @@ public List<Disposable> subscriptions() {
     // AutoCloseable
     @Override
     public void close() throws Exception {
-        vm.eventRequestManager().deleteEventRequests(requests());
+        try {
+            vm.eventRequestManager().deleteEventRequests(requests());
+        } catch (VMDisconnectedException ex) {
+            // ignore since removing breakpoints is meaningless when JVM is terminated.
+        }
         subscriptions().forEach(subscription -> {
             subscription.dispose();
         });
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ProtocolServer.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ProtocolServer.java
@@ -42,7 +42,7 @@ public class ProtocolServer extends AbstractProtocolServer {
      */
     public ProtocolServer(InputStream input, OutputStream output, IProviderContext context) {
         super(input, output);
-        this.debugAdapter = new DebugAdapter(this, context);
+        debugAdapter = new DebugAdapter(this, context);
     }
 
     /**
@@ -77,7 +77,7 @@ public CompletableFuture<Messages.Response> sendRequest(Messages.Request request
     @Override
     protected void dispatchRequest(Messages.Request request) {
         usageDataSession.recordRequest(request);
-        this.debugAdapter.dispatchRequest(request).thenCompose((response) -> {
+        debugAdapter.dispatchRequest(request).thenCompose((response) -> {
             CompletableFuture<Void> future = new CompletableFuture<>();
             if (response != null) {
                 sendResponse(response);
@@ -110,5 +110,4 @@ protected void dispatchRequest(Messages.Request request) {
             return null;
         });
     }
-
 }
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ThreadsRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ThreadsRequestHandler.java
@@ -79,7 +79,7 @@ private CompletableFuture<Response> threads(Requests.ThreadsArguments arguments,
                 Types.Thread clientThread = new Types.Thread(thread.uniqueID(), "Thread [" + thread.name() + "]");
                 threads.add(clientThread);
             }
-        } catch (VMDisconnectedException | ObjectCollectedException ex) {
+        } catch (ObjectCollectedException ex) {
             // allThreads may throw VMDisconnectedException when VM terminates and thread.name() may throw ObjectCollectedException
             // when the thread is exiting.
         }
@@ -117,12 +117,8 @@ private CompletableFuture<Response> next(Requests.NextArguments arguments, Respo
     private CompletableFuture<Response> pause(Requests.PauseArguments arguments, Response response, IDebugAdapterContext context) {
         ThreadReference thread = DebugUtility.getThread(context.getDebugSession(), arguments.threadId);
         if (thread != null) {
-            try {
-                thread.suspend();
-                context.getProtocolServer().sendEvent(new Events.StoppedEvent("pause", arguments.threadId));
-            } catch (VMDisconnectedException ex) {
-                return AdapterUtils.createAsyncErrorResponse(response, ErrorCode.VM_TERMINATED, "Target VM is already terminated.");
-            }
+            thread.suspend();
+            context.getProtocolServer().sendEvent(new Events.StoppedEvent("pause", arguments.threadId));
         } else {
             context.getDebugSession().suspend();
             context.getProtocolServer().sendEvent(new Events.StoppedEvent("pause", arguments.threadId, true));
