editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/RemoteAnalysisServerImpl.java - Issue 349573004: close channel and exit analysis server on editor shutdown

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/RemoteAnalysisServerImpl.java

Issue 349573004: close channel and exit analysis server on editor shutdown (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: merge Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/ByteRequestSink.java ('k') | editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/RequestSink.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/RemoteAnalysisServerImpl.java

diff --git a/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/RemoteAnalysisServerImpl.java b/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/RemoteAnalysisServerImpl.java

index a6949076f2af11b5d5d470e508aac3e5a7f8a58d..62a2257b575e51d941050642ad2d02eb2b785f26 100644

--- a/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/RemoteAnalysisServerImpl.java

+++ b/editor/tools/plugins/com.google.dart.server/src/com/google/dart/server/internal/remote/RemoteAnalysisServerImpl.java

@@ -22,6 +22,7 @@ import com.google.dart.server.AnalysisServer;

import com.google.dart.server.AnalysisServerListener;

import com.google.dart.server.AnalysisService;

import com.google.dart.server.AssistsConsumer;

+import com.google.dart.server.BasicConsumer;

import com.google.dart.server.CompletionIdConsumer;

import com.google.dart.server.Consumer;

import com.google.dart.server.ContentChange;

@@ -319,7 +320,13 @@ public class RemoteAnalysisServerImpl implements AnalysisServer {

@Override

public void shutdown() {

String id = generateUniqueId();

- sendRequestToServer(id, RequestUtilities.generateServerShutdown(id), null);

+ sendRequestToServer(id, RequestUtilities.generateServerShutdown(id), new BasicConsumer() {

+ @Override

+ public void received() {

+ // Close communication channels once response has been received

+ requestSink.close();

+ }

+ });

}

@VisibleForTesting

@@ -438,6 +445,8 @@ public class RemoteAnalysisServerImpl implements AnalysisServer {

processCompletionIdConsumer((CompletionIdConsumer) consumer, resultObject);

} else if (consumer instanceof VersionConsumer) {

processVersionConsumer((VersionConsumer) consumer, resultObject);

+ } else if (consumer instanceof BasicConsumer) {

+ ((BasicConsumer) consumer).received();

}

synchronized (consumerMapLock) {

consumerMap.remove(idString);