fix: Regression where on_close is called more than once, close #146

Author: housleyjk

.gitignore

@@ -3,4 +3,5 @@ target
 todo.txt
 /tests/reports
 .project
+.cache
 

CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="v0.7.3"></a>
+### v0.7.3 (2017-06-07)
+
+
+#### Bug Fixes
+
+*   Issue with `on_close` called twice
+
+
 <a name="v0.7.2"></a>
 ### v0.7.2 (2017-06-04)
 

Cargo.toml

@@ -7,7 +7,7 @@ license = "MIT"
 name = "ws"
 readme = "README.md"
 repository = "https://github.com/housleyjk/ws-rs"
-version = "0.7.2"
+version = "0.7.1"
 
 [dependencies]
 httparse = "1.0"

src/connection.rs

@@ -597,8 +597,12 @@ impl<H> Connection<H>
                 while let Some(len) = try!(self.buffer_in()) {
                     try!(self.read_frames());
                     if len == 0 {
-                        self.events.remove(Ready::readable());
-                        break;
+                        if self.events.is_writable() {
+                            self.events.remove(Ready::readable());
+                        } else {
+                            self.disconnect()
+                        }
+                        break
                     }
                 }
                 Ok(())

src/io.rs

@@ -24,8 +24,6 @@ use connection::Connection;
 use factory::Factory;
 use util::Slab;
 use super::Settings;
-use protocol::CloseCode;
-use handler::Handler as HandlerT;
 
 const QUEUE: Token = Token(usize::MAX - 3);
 const TIMER: Token = Token(usize::MAX - 4);
@@ -470,8 +468,7 @@ impl<F> Handler<F>
             } else {
                 trace!("WebSocket connection to token={:?} disconnected.", token);
             }
-            let mut handler = self.connections.remove(token).unwrap().consume();
-            handler.on_close(CloseCode::Abnormal, "");
+            let handler = self.connections.remove(token).unwrap().consume();
             self.factory.connection_lost(handler);
         } else {
             self.schedule(poll, &self.connections[token]).or_else(|err| {
@@ -579,9 +576,9 @@ impl<F> Handler<F>
                             self.connections[token].error(err)
                         }
                     }
-                    
+
                     let conn_events = self.connections[token].events();
-                    
+
                     if (events & conn_events).is_writable() {
                         if let Err(err) = self.connections[token].write() {
                             trace!("Encountered error while writing: {}", err);