From 819e8e6c82f05203c28d4e191d7dbe351d2f2905 Mon Sep 17 00:00:00 2001
From: aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 29 Sep 2003 14:39:54 +0000
Subject: * lib/net/http.rb (finish): does not raise IOError even if !started?,
 to allow duplicated #finish call. * lib/net/pop.rb (finish): ditto. *
 lib/net/smtp.rb (finish): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/net/http.rb | 4 +---
 lib/net/pop.rb  | 6 ++----
 lib/net/smtp.rb | 7 ++-----
 3 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'lib')

diff --git a/lib/net/http.rb b/lib/net/http.rb
index 38dca6a440..bb4934be6f 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -416,7 +416,7 @@ module Net # :nodoc:
           do_start
           return yield(self)
         ensure
-          finish if @started
+          finish
         end
       end
       do_start
@@ -437,9 +437,7 @@ module Net # :nodoc:
     private :on_connect
 
     # Finishes HTTP session and closes TCP connection.
-    # If HTTP session had not started, raises an IOError.
     def finish
-      raise IOError, 'closing already closed HTTP session' unless @started
       @socket.close if @socket and not @socket.closed?
       @socket = nil
       @started = false
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
index 2d4b57162e..00a7af2bdb 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -415,7 +415,7 @@ module Net
           do_start account, password
           return yield(self)
         ensure
-          finish if @started
+          finish
         end
       else
         do_start account, password
@@ -441,10 +441,8 @@ module Net
     end
     private :on_connect
 
-    # Finishes a POP3 session.
-    # If a POP3 session has not been started, raises an IOError.
+    # Finishes a POP3 session and closes TCP connection.
     def finish
-      raise IOError, 'already closed POP session' unless @started
       @mails = nil
       @command.quit if @command
       @command = nil
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index d2de78239b..b14d43832a 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -331,7 +331,7 @@ module Net # :nodoc:
           do_start(helo, user, secret, authtype)
           return yield(self)
         ensure
-          finish if @started
+          finish
         end
       else
         do_start(helo, user, secret, authtype)
@@ -365,11 +365,8 @@ module Net # :nodoc:
     end
     private :do_start
 
-    # Finish (close) the SMTP session.  
-    #
-    # If the SMTP session has not been started, an IOError is raised.
+    # Finishes the SMTP session and closes TCP connection.
     def finish
-      raise IOError, 'closing already closed SMTP session' unless @started
       quit if @socket and not @socket.closed? and not @error_occured
       @socket.close if @socket and not @socket.closed?
       @socket = nil
-- 
cgit v1.2.3