[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-254-g6820a5e

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  6820a5ec13af7472af93c345f1a36d690c9f3121 (commit)
      from  02a444106a21c3c757b3b58977e78f1a036c20ce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 6820a5ec13af7472af93c345f1a36d690c9f3121
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri May 28 15:28:32 2010 +0200

    Do a `close' in both cases `shutdown' succeeds or not.

diff --git a/myserver/src/connection/connection.cpp 
b/myserver/src/connection/connection.cpp
index f33025a..859778e 100644
--- a/myserver/src/connection/connection.cpp
+++ b/myserver/src/connection/connection.cpp
@@ -51,6 +51,13 @@ void Connection::destroy ()
       try
         {
           socket->shutdown (SHUT_RDWR);
+        }
+      catch (std::exception & e)
+        {
+        }
+
+      try
+        {
           socket->close ();
           delete socket;
           socket = NULL;
@@ -58,6 +65,7 @@ void Connection::destroy ()
       catch (SocketException & e)
         {
         }
+
     }
 
   if (protocolBuffer)

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/connection/connection.cpp |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU MyServer