[ Service ] Fix issue where FlagList was being populated with nulls in package:vm_service

bkonyi · bkonyi · commit 20f17c725d65 · 2019-07-25T19:33:25.000Z
Fixes dart-archive/vm_service_drivers#255 Change-Id: I4e7e3864263d2a2120594b73369ff629fbfd810b Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/110546 Commit-Queue: Ben Konyi <bkonyi@google.com> Reviewed-by: Kenzie Schmoll <kenzieschmoll@google.com>
diff --git a/pkg/vm_service/lib/vm_service.dart b/pkg/vm_service/lib/vm_service.dart
@@ -37,7 +37,18 @@ Object createServiceObject(dynamic json, List<String> expectedTypes) {
     return json.map((e) => createServiceObject(e, expectedTypes)).toList();
   } else if (json is Map) {
     String type = json['type'];
-    if (_isNullInstance(json) && (!expectedTypes.contains(type))) {
+
+    // Not a Response type.
+    if (type == null) {
+      // If there's only one expected type, we'll just use that type.
+      if (expectedTypes.length == 1) {
+        type = expectedTypes.first;
+      } else {
+        return null;
+      }
+    } else if (_isNullInstance(json) && (!expectedTypes.contains(type))) {
+      // Replace null instances with null when we don't expect an instance to
+      // be returned.
       return null;
     }
     if (_typeFactories[type] == null) {
diff --git a/pkg/vm_service/tool/dart/generate_dart.dart b/pkg/vm_service/tool/dart/generate_dart.dart
@@ -458,7 +458,18 @@ Object createServiceObject(dynamic json, List<String> expectedTypes) {
     return json.map((e) => createServiceObject(e, expectedTypes)).toList();
   } else if (json is Map) {
     String type = json['type'];
-    if (_isNullInstance(json) && (!expectedTypes.contains(type))) {
+
+    // Not a Response type.
+    if (type == null) {
+      // If there's only one expected type, we'll just use that type.
+      if (expectedTypes.length == 1) {
+        type = expectedTypes.first;
+      } else {
+        return null;
+      }
+    } else if (_isNullInstance(json) && (!expectedTypes.contains(type))) {
+      // Replace null instances with null when we don't expect an instance to
+      // be returned.
       return null;
     }
     if (_typeFactories[type] == null) {
