New OutputStream interface

runtime/bin/socket_impl.dart

 // Copyright (c) 2011, 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.
 
 
 class _SocketBase {
   // Bit flags used when communicating between the eventhandler and
   // dart code. The EVENT flags are used to indicate events of
   // interest when sending a message from dart code to the
   // eventhandler. When receiving a message from the eventhandler the
@@ skipping 29 matching lines @@
   }
 
   /*
    * Multiplexes socket events to the right socket handler.
    */
   void _multiplex(List<int> message) {
     assert(message.length == 1);
     _canActivateHandlers = false;
     int event_mask = message[0];
       for (int i = _FIRST_EVENT; i <= _LAST_EVENT; i++) {
-        if (((event_mask & (1 << i)) != 0) && _handlerMap[i] !== null) {
+        if (((event_mask & (1 << i)) != 0) && _handlerMap[i] != null) {
           var handleEvent = _handlerMap[i];
 
           // Unregister the out handler before executing it.
           if (i == _OUT_EVENT) _setHandler(i, null);
 
           // Don't call the in handler if there is no data available
           // after all.
           if (i == _IN_EVENT && this is _Socket && available() == 0) continue;
 
           handleEvent();
         }
       }
     _canActivateHandlers = true;
-    _doActivateHandlers();
+    _activateHandlers();
   }
 
   void _setHandler(int event, void callback()) {
-    if (callback === null) {
+    if (callback == null) {
       _handlerMask &= ~(1 << event);
     } else {
       _handlerMask |= (1 << event);
     }
     _handlerMap[event] = callback;
-    _doActivateHandlers();
+    _activateHandlers();
   }
 
   void _getPort() native "Socket_GetPort";
 
   void setErrorHandler(void callback()) {
     _setHandler(_ERROR_EVENT, callback);
   }
 
-  void _doActivateHandlers() {
+  void _activateHandlers() {
     if (_canActivateHandlers && (_id >= 0)) {
       int data = _handlerMask;
       if (_isListenSocket()) data |= (1 << _LISTENING_SOCKET);
       EventHandler._sendData(_id, _handler, data);
     }
   }
 
   void _scheduleEvent(int event) {
     _handler.toSendPort().send([1 << event], null);
   }
 
   int get port() {
     if (_port === null) {
       _port = _getPort();
     }
     return _port;
   }
 
   void close() {
     if (_id >= 0) {
       EventHandler._sendData(_id, _handler, 1 << _CLOSE_COMMAND);
       _handler.close();
       _handler = null;
       _id = -1;
-    } else {
+    } else if (_handler != null) {
       // This is to support closing sockets created but never assigned
       // any actual socket.
-      if (_handler === null) {
-        throw new
-            SocketIOException("Error: close failed - invalid socket handle");
-      } else {
-        _handler.close();
-        _handler = null;
-      }
+      _handler.close();
+      _handler = null;
     }
+    // Don't throw exceptions when closing sockets more than once.

[Mads Ager (google), 2011/10/31 09:56:48]

Maybe remove this here and add it is a comment to the interface instead?

[Søren Gjesse, 2011/11/01 08:56:46]

Done.

   }
 
   abstract bool _isListenSocket();
 
   /*
    * Socket id is set from native. -1 indicates that the socket was closed.
    */
   int _id;
 
   /*
@@ skipping 174 matching lines @@
     if (_outputStream === null) {
       _outputStream = new SocketOutputStream(this);
     }
     return _outputStream;
   }
 
   SocketInputStream _inputStream;
   SocketOutputStream _outputStream;
 }