From 6c6beb55370b2364617cdfc8061b66f8cb373c2f Mon Sep 17 00:00:00 2001
From: "rnystrom@google.com" <rnystrom@google.com>
Date: Wed, 24 Sep 2014 00:24:31 +0000
Subject: [PATCH] Regenerate a snapshot if the first isolate fails to load.
R=nweiz@google.com
Review URL: https://codereview.chromium.org//593363002
git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@40618 260f80e4-7a28-3924-810f-c04153c831b5
---
lib/src/dart.dart | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/lib/src/dart.dart b/lib/src/dart.dart
index 650d3aad..0b5ab8cd 100644
--- a/lib/src/dart.dart
+++ b/lib/src/dart.dart
@@ -153,15 +153,22 @@ class _DirectiveCollector extends GeneralizingAstVisitor {
/// If [snapshot] is passed, the isolate will be loaded from that path if it
/// exists. Otherwise, a snapshot of the isolate's code will be saved to that
/// path once the isolate is loaded.
-Future runInIsolate(String code, message, {packageRoot, String snapshot}) {
+Future runInIsolate(String code, message, {packageRoot, String snapshot})
+ async {
if (snapshot != null && fileExists(snapshot)) {
log.fine("Spawning isolate from $snapshot.");
if (packageRoot != null) packageRoot = packageRoot.toString();
- return Isolate.spawnUri(path.toUri(snapshot), [], message,
- packageRoot: packageRoot);
+ try {
+ await Isolate.spawnUri(path.toUri(snapshot), [], message,
+ packageRoot: packageRoot);
+ return;
+ } on IsolateSpawnException catch (error) {
+ log.fine("Couldn't load existing snapshot $snapshot:\n$error");
+ // Do nothing, we will regenerate the snapshot below.
+ }
}
- return withTempDir((dir) async {
+ await withTempDir((dir) async {
var dartPath = path.join(dir, 'runInIsolate.dart');
writeTextFile(dartPath, code, dontLogContents: true);
var port = new ReceivePort();
--
GitLab