Clean up race condition fix

Author: sfackler

src/lib.rs

@@ -72,8 +72,9 @@ use openssl::crypto::hash::{HashType, Hasher};
 use openssl::ssl::{SslContext, MaybeSslStream};
 use serialize::hex::ToHex;
 use std::cell::{Cell, RefCell};
+use std::cmp::max;
 use std::collections::{RingBuf, HashMap};
-use std::io::{BufferedStream, IoResult, IoError, IoErrorKind, standard_error};
+use std::io::{BufferedStream, IoResult, IoError, IoErrorKind};
 use std::io::net::ip::Port;
 use std::iter::IteratorCloneExt;
 use std::time::Duration;
@@ -279,10 +280,8 @@ impl<'conn> Notifications<'conn> {
         let end = time::now().to_timespec() + timeout;
         loop {
             let now = time::now().to_timespec();
-            if now > end {
-                return Err(Error::IoError(standard_error(IoErrorKind::TimedOut)));
-            }
-            conn.stream.set_read_timeout(Some((end - now).num_milliseconds() as u64));
+            let timeout = max(0, (end - now).num_milliseconds()) as u64;
+            conn.stream.set_read_timeout(Some(timeout));
             match conn.read_one_message() {
                 Ok(Some(NotificationResponse { pid, channel, payload })) => {
                     return Ok(Notification {