re-raise DRbConnError

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5049 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 9 deletions

diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 20e17bd251..fb083b0c4d 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -353,13 +353,7 @@ module DRb
 
   # Error raised when an error occurs on the underlying communication
   # protocol.
-  class DRbConnError < DRbError
-    def self.new_with_error(cause)
-      conn_error = self.new(cause.message)
-      conn_error.set_backtrace(cause.backtrace)
-      conn_error
-    end
-  end
+  class DRbConnError < DRbError; end
 
   # Class responsible for converting between an object and its id.
   #
@@ -558,7 +552,7 @@ module DRb
       begin
         sz = soc.read(4)	# sizeof (N)
       rescue
-        raise(DRbConnError.new_with_error($!))
+        raise(DRbConnError, $!.message, $!.backtrace)
       end
       raise(DRbConnError, 'connection closed') if sz.nil?
       raise(DRbConnError, 'premature header') if sz.size < 4
@@ -567,7 +561,7 @@ module DRb
       begin
         str = soc.read(sz)
       rescue
-        raise(DRbConnError.new_with_error($!))
+        raise(DRbConnError, $!.message, $!.backtrace)
       end
       raise(DRbConnError, 'connection closed') if sz.nil?
       raise(DRbConnError, 'premature marshal format(can\'t read)') if str.size < sz