| Index: runtime/bin/vmservice/vmservice_io.dart
|
| diff --git a/runtime/bin/vmservice/vmservice_io.dart b/runtime/bin/vmservice/vmservice_io.dart
|
| index eb44a6c52a56f1635edb950ef55f2a3ae353a185..1f7eee2867a296c62feb26b35a96faf9189446e6 100644
|
| --- a/runtime/bin/vmservice/vmservice_io.dart
|
| +++ b/runtime/bin/vmservice/vmservice_io.dart
|
| @@ -11,7 +11,6 @@ import 'dart:isolate';
|
| import 'dart:_vmservice';
|
|
|
| part 'loader.dart';
|
| -part 'resources.dart';
|
| part 'server.dart';
|
|
|
| // The TCP ip/port that the HTTP server listens on.
|
| @@ -25,9 +24,10 @@ bool _isWindows = false;
|
| var _signalWatch;
|
| var _signalSubscription;
|
|
|
| -// HTTP servr.
|
| +// HTTP server.
|
| Server server;
|
| Future<Server> serverFuture;
|
| +Map<String, Asset> assets;
|
|
|
| _onShutdown() {
|
| if (server != null) {
|
| @@ -42,8 +42,11 @@ _onShutdown() {
|
| }
|
|
|
| _bootServer() {
|
| - // Load resources.
|
| - _triggerResourceLoad();
|
| + try {
|
| + assets = Asset.request();
|
| + } catch (e) {
|
| + print('Could not load Observatory assets: $e');
|
| + }
|
| // Lazily create service.
|
| var service = new VMService();
|
| service.onShutdown = _onShutdown;
|
|
|