Cleanup VM service

runtime/bin/vmservice/server.dart

Index: runtime/bin/vmservice/server.dart
diff --git a/runtime/bin/vmservice/server.dart b/runtime/bin/vmservice/server.dart
index 7992b3b091f6e854b345bb418c313a47f5a08996..502370852ad40561333b107be8242f4e039a3e08 100644
--- a/runtime/bin/vmservice/server.dart
+++ b/runtime/bin/vmservice/server.dart
@@ -12,6 +12,12 @@ class Server {
 
   Server(this.service, this.port);
 
+  void _sendResponse(HttpRequest request, String Response) {
+    request.response.headers.contentType = jsonContentType;

[Jacob, 2013/12/06 01:52:22]

use cascades
request.response..headers.contentType = jsonContentType
                ..write(response)
                ..close();         

+    request.response.write(response);
+    request.response.close();
+  }
+
   void _requestHandler(HttpRequest request) {
     // Allow cross origin requests.
     request.response.headers.add('Access-Control-Allow-Origin', '*');
@@ -31,27 +37,16 @@ class Server {
 
     var serviceRequest = new ServiceRequest();
     var r = serviceRequest.parse(request.uri);
-    if (!r) {
-      // Did not understand the request uri.
-      serviceRequest.setErrorResponse('Invalid request uri: ${request.uri}');
-    } else {
+    if (r) {
       var f = service.runningIsolates.route(serviceRequest);
-      if (f != null) {
-        f.then((_) {
-          request.response.headers.contentType = jsonContentType;
-          request.response.write(serviceRequest.response);
-          request.response.close();
-        }).catchError((e) { });
-        return;
-      } else {
-        // Nothing responds to this type of request.
-        serviceRequest.setErrorResponse('No route for: $path');
-      }
+      assert(f != null);
+      f.then((_) {
+        _sendResponse(request, serviceRequest.response);
+      }).catchError((e) {
+        // Error replying over HTTP.
+      });
     }
-
-    request.response.headers.contentType = jsonContentType;
-    request.response.write(serviceRequest.response);
-    request.response.close();
+    _sendResponse(request, serviceRequest.response);
   }
 
   Future startServer() {