Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(633)

Unified Diff: runtime/vm/service.cc

Issue 1255003003: Make VM service id handling JSON-RPC 2 compliant. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: cr Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/json_stream.cc ('k') | runtime/vm/service/message.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/service.cc
diff --git a/runtime/vm/service.cc b/runtime/vm/service.cc
index a75f897e20f5ef04acd866514b3c684733875cc1..4674f143e656d646e288ec0981b222196f61291e 100644
--- a/runtime/vm/service.cc
+++ b/runtime/vm/service.cc
@@ -509,7 +509,7 @@ void Service::InvokeMethod(Isolate* isolate, const Array& msg) {
HANDLESCOPE(isolate);
Instance& reply_port = Instance::Handle(isolate);
- String& seq = String::Handle(isolate);
+ Instance& seq = String::Handle(isolate);
String& method_name = String::Handle(isolate);
Array& param_keys = Array::Handle(isolate);
Array& param_values = Array::Handle(isolate);
@@ -520,7 +520,7 @@ void Service::InvokeMethod(Isolate* isolate, const Array& msg) {
param_values ^= msg.At(5);
ASSERT(!method_name.IsNull());
- ASSERT(!seq.IsNull());
+ ASSERT(seq.IsNull() || seq.IsString() || seq.IsNumber());
ASSERT(!param_keys.IsNull());
ASSERT(!param_values.IsNull());
ASSERT(param_keys.Length() == param_values.Length());
« no previous file with comments | « runtime/vm/json_stream.cc ('k') | runtime/vm/service/message.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698