Minimize diff slightly

rabbitmq · Nov 29, 2011 · 8e407c4 · 8e407c4
1 parent 150a5b0
commit 8e407c4
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs
@@ -424,12 +424,13 @@ public void Abort(ushort reasonCode, string reasonText, int timeout)
         ///</remarks>
         public void Close(ShutdownEventArgs reason, bool abort, int timeout)
         {
-            bool reasonSet = SetCloseReason(reason);
-            if (!reasonSet && !abort)
-                throw new AlreadyClosedException(m_closeReason);
-
-            if (reasonSet)
-            {                               
+            if (!SetCloseReason(reason))
+            {
+               if (!abort)
+                    throw new AlreadyClosedException(m_closeReason);
+            }
+            else
+            {
                 OnShutdown();
                 m_session0.SetSessionClosing(false);
 
@@ -452,7 +453,7 @@ public void Close(ShutdownEventArgs reason, bool abort, int timeout)
                         if (!abort)
                             throw ioe;
                         else
-                            LogCloseError("Couldn't close connection cleanly. " 
+                            LogCloseError("Couldn't close connection cleanly. "
                                           + "Socket closed unexpectedly", ioe);
                     }
                 }