Analysis server connect fixes

pkg/analysis_server/lib/http_server.dart

Index: pkg/analysis_server/lib/http_server.dart
diff --git a/pkg/analysis_server/lib/http_server.dart b/pkg/analysis_server/lib/http_server.dart
index c295e649e5f61bfb43aa397660eb9de76877d6b2..6b66383713beebb4d0599cb039cf88d365cbd00b 100644
--- a/pkg/analysis_server/lib/http_server.dart
+++ b/pkg/analysis_server/lib/http_server.dart
@@ -39,7 +39,7 @@ class HttpAnalysisServer {
    * 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.
@@ -94,11 +94,11 @@ class HttpAnalysisServer {
   /**
    * 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;
         }
@@ -119,7 +119,7 @@ class HttpAnalysisServer {
   void _handleGetRequest(HttpRequest request) {
     if (getHandler == null) {
       getHandler = new GetHandler();
-      getHandler.server = server;
+      getHandler.server = analysisServer;
     }
     getHandler.handleGetRequest(request);
   }
@@ -129,12 +129,12 @@ class HttpAnalysisServer {
    * 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();
   }
 
   /**