RUBY-429 rescue granularity

2012-04-04 20:12:36 -04:00 · 2012-04-04 20:12:36 -04:00 · 58f0ee8fff
parent b2a1841f9c
commit 58f0ee8fff
1 changed files with 4 additions and 3 deletions
--- a/lib/mongo/util/tcp_socket.rb
+++ b/lib/mongo/util/tcp_socket.rb
@ -65,9 +65,10 @@ module Mongo
          @socket.readpartial(maxlen, buffer)
        rescue EOFError
          return ConnectionError
-        rescue Errno::ECONNRESET, Errno::EPIPE, Errno::EINVAL, Errno::EBADF, Errno::EINTR,
-          Errno::EIO, Errno::ENOTCONN, SocketError
-          raise ConnectionFailure 
+        rescue Errno::ECONNRESET, Errno::ENOTCONN, Errno::EBADF
+          raise ConnectionFailure
+        rescue Errno::EINTR, Errno::EIO, Errno::EPIPE 
+          raise OperationFailure 
        end
      else
        raise OperationTimeout