Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

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

Issue 705173002: ignore exceptions during shutdown (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: update AST class comment Created 6 years, 1 month 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 | « no previous file | editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/analysis/model/LightweightModel_NEW.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 df2f6c3497ca75ad186ff2210fe37c2522fd5583..8f9ce51de51964b6f64ae138e03c126012678ef7 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
@@ -139,6 +139,10 @@ public class RemoteAnalysisServerImpl implements AnalysisServer {
stream.lastRequestProcessed();
}
} catch (Throwable e) {
+ // Ignore exceptions during shutdown
+ if (shutdownRequested) {
+ return;
+ }
if (e instanceof IOException) {
String message = e.getMessage();
if (message != null && message.contains("closed")) {
@@ -219,6 +223,11 @@ public class RemoteAnalysisServerImpl implements AnalysisServer {
*/
private boolean watch;
+ /**
+ * A flag indicating whether the server shutdown process has been requested.
+ */
+ private boolean shutdownRequested;
+
public RemoteAnalysisServerImpl(AnalysisServerSocket socket) {
this.socket = socket;
}
@@ -450,6 +459,7 @@ public class RemoteAnalysisServerImpl implements AnalysisServer {
@Override
public void server_shutdown() {
+ shutdownRequested = true;
stopWatcher();
String id = generateUniqueId();
sendRequestToServer(id, RequestUtilities.generateServerShutdown(id), new BasicConsumer() {
« no previous file with comments | « no previous file | editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/analysis/model/LightweightModel_NEW.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698