Analysis server connect fixes

pkg/analysis_server/lib/http_server.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.
 
 library http.server;
 
 import 'dart:io';
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/channel.dart';
@@ skipping 21 matching lines @@
   /**
    * The name of the option used to specify the port to which the server will
    * connect.
    */
   static const String PORT_OPTION = "port";
 
   /**
    * The analysis server that was created when an UPGRADE request was received,
    * or `null` if no such request has yet been received.
    */
-  AnalysisServer server;
+  AnalysisServer analysisServer;
 
   /**
    * An object that can handle GET requests.
    */
   GetHandler getHandler;
 
   /**
    * Initialize a newly created HTTP server.
    */
   HttpAnalysisServer();
@@ skipping 34 matching lines @@
       print('');
       _printUsage(parser);
       exitCode = 1;
       return;
     }
   }
 
   /**
    * Attach a listener to a newly created HTTP server.
    */
-  void _handleServer(HttpServer server) {
-    server.listen((HttpRequest request) {
+  void _handleServer(HttpServer httServer) {
+    httServer.listen((HttpRequest request) {
       List<String> updateValues = request.headers[HttpHeaders.UPGRADE];
       if (updateValues != null && updateValues.indexOf('websocket') >= 0) {
-        if (server != null) {
+        if (analysisServer != null) {
           _returnServerAlreadyStarted(request);
           return;
         }
         WebSocketTransformer.upgrade(request).then((WebSocket websocket) {
           _handleWebSocket(websocket);
         });
       } else if (request.method == 'GET') {
         _handleGetRequest(request);
       } else {
         _returnUnknownRequest(request);
       }
     });
   }
 
   /**
    * Handle a GET request received by the HTTP server.
    */
   void _handleGetRequest(HttpRequest request) {
     if (getHandler == null) {
       getHandler = new GetHandler();
-      getHandler.server = server;
+      getHandler.server = analysisServer;
     }
     getHandler.handleGetRequest(request);
   }
 
   /**
    * Handle an UPGRADE request received by the HTTP server by creating and
    * running an analysis server on a [WebSocket]-based communication channel.
    */
   void _handleWebSocket(WebSocket socket) {
-    server = new AnalysisServer(new WebSocketChannel(socket));
-    _initializeHandlers(server);
+    analysisServer = new AnalysisServer(new WebSocketChannel(socket));
+    _initializeHandlers(analysisServer);
     if (getHandler != null) {
-      getHandler.server = server;
+      getHandler.server = analysisServer;
     }
-    server.run();
+    analysisServer.run();
   }
 
   /**
    * Initialize the handlers to be used by the given [server].
    */
   void _initializeHandlers(AnalysisServer server) {
     server.handlers = [
         new ServerDomainHandler(server),
         new ContextDomainHandler(server),
     ];
@@ skipping 26 matching lines @@
    * server.
    */
   void _returnUnknownRequest(HttpRequest request) {
     HttpResponse response = request.response;
     response.statusCode = HttpStatus.NOT_FOUND;
     response.headers.add(HttpHeaders.CONTENT_TYPE, "text/plain");
     response.write('Not found');
     response.close();
   }
 }