Fix reload() for VM object

runtime/observatory/lib/src/service/object.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of service;
 
 /// An RpcException represents an exceptional event that happened
 /// while invoking an rpc.
 abstract class RpcException implements Exception {
   RpcException(this.message);
@@ skipping 263 matching lines @@
       'objectId': id,
     };
     return isolate.invokeRpcNoUpgrade('getObject', params);
   }
 
   /// Reload [this]. Returns a future which completes to [this] or
   /// an exception.
   Future<ServiceObject> reload() {
     // TODO(turnidge): Checking for a null id should be part of the
     // "immmutable" check.
-    if (id == null || id == '') {
-      return new Future.value(this);
-    }
-    if (loaded && immutable) {
+    bool hasId = (id != null) && (id != '');
+    bool isVM = this is VM;
+    // We should always reload the VM.
+    // We can't reload objects without an id.
+    // We shouldn't reload an immutable and already loaded object.
+    bool skipLoad = !isVM && (!hasId || (immutable && loaded));
+    if (skipLoad) {
       return new Future.value(this);
     }
     if (_inProgressReload == null) {
       var completer = new Completer<ServiceObject>();
       _inProgressReload = completer.future;
       _fetchDirect().then((ObservableMap map) {
         var mapType = _stripRef(map['type']);
         if (mapType == 'Sentinel') {
           // An object may have been collected, etc.
           completer.complete(new ServiceObject._fromMap(owner, map));
@@ skipping 2064 matching lines @@
     var pattern = new RegExp("(^|[^A-Za-z0-9\.])$name[^A-Za-z0-9]");
 
     // Result.
     var r = <LocalVarLocation>[];
 
     // Limits.
     final lastLine = tokenToLine(endTokenPos);
     if (lastLine == null) {
       return r;
     }
-    
+
     final lastColumn = tokenToCol(endTokenPos);
     if (lastColumn == null) {
       return r;
     }
     // Current scan position.
     var line = tokenToLine(tokenPos);
     if (line == null) {
       return r;
     }
     var column = tokenToCol(tokenPos);
@@ skipping 727 matching lines @@
     var v = list[i];
     if ((v is ObservableMap) && _isServiceMap(v)) {
       list[i] = owner.getFromMap(v);
     } else if (v is ObservableList) {
       _upgradeObservableList(v, owner);
     } else if (v is ObservableMap) {
       _upgradeObservableMap(v, owner);
     }
   }
 }