Index: runtime/vm/isolate.cc |
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc |
index 5c5f9775919a0eb06240bba0fa7bc7707865230e..97f02d86d671d0f6a444e9c466a179e96750eb32 100644 |
--- a/runtime/vm/isolate.cc |
+++ b/runtime/vm/isolate.cc |
@@ -27,6 +27,7 @@ |
#include "vm/timer.h" |
#include "vm/visitor.h" |
#include "vm/object_id_ring.h" |
+#include "vm/service.h" |
namespace dart { |
@@ -136,9 +137,15 @@ bool IsolateMessageHandler::HandleMessage(Message* message) { |
bool success = true; |
if (message->IsOOB()) { |
- // For now the only OOB messages are Mirrors messages. |
- HandleMirrorsMessage(isolate_, message->reply_port(), msg); |
+ if (message->IsService()) { |
+ HandleServiceMessage(isolate_, message->reply_port(), msg); |
+ } else { |
+ ASSERT(message->type() == Message::kNormalType); |
+ HandleMirrorsMessage(isolate_, message->reply_port(), msg); |
+ } |
} else { |
+ // If it is not an OOB message, it must be a normal message. |
+ ASSERT(message->type() == Message::kNormalType); |
const Object& result = Object::Handle( |
DartLibraryCalls::HandleMessage( |
receive_port, message->reply_port(), msg)); |