| Index: runtime/bin/vmservice/client/lib/src/service/service.dart
|
| diff --git a/runtime/bin/vmservice/client/lib/src/service/service.dart b/runtime/bin/vmservice/client/lib/src/service/service.dart
|
| index bc160d88a9f93715a6ada0beb860f5d3c078ca95..78c105dced1d6af9e80609a2492f3fc15e496fe3 100644
|
| --- a/runtime/bin/vmservice/client/lib/src/service/service.dart
|
| +++ b/runtime/bin/vmservice/client/lib/src/service/service.dart
|
| @@ -54,10 +54,12 @@ ServiceObject _upgradeToServiceObject(VM vm, Isolate isolate, ObservableMap m) {
|
| var type = ServiceObject.stripRef(m['type']);
|
| switch (type) {
|
| case 'Error':
|
| - return new ServiceError.fromMap(isolate, m);
|
| - case 'IsolateList':
|
| - vm.isolates.update(m);
|
| - return vm.isolates;
|
| + if (isolate != null) {
|
| + return new ServiceError.fromMap(isolate, m);
|
| + } else {
|
| + return new ServiceError.fromMap(vm, m);
|
| + }
|
| + break;
|
| case 'Script':
|
| return isolate.scripts.putIfAbsent(m);
|
| case 'Code':
|
| @@ -68,6 +70,8 @@ ServiceObject _upgradeToServiceObject(VM vm, Isolate isolate, ObservableMap m) {
|
| return isolate.classes.putIfAbsent(m);
|
| case 'Function':
|
| return isolate.functions.putIfAbsent(m);
|
| + case 'VM':
|
| + return vm.update(m);
|
| }
|
| return new ServiceMap.fromMap(isolate, m);
|
| }
|
|
|