Refactorings.

tmds · Jun 19, 2024 · bb18b6a · bb18b6a
1 parent 7561068
commit bb18b6a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/Tmds.DBus.Protocol/Connection.cs b/src/Tmds.DBus.Protocol/Connection.cs
@@ -296,25 +296,24 @@ private static Connection CreateConnection(ref Connection? field, string? addres
 
     public bool TrySendMessage(MessageBuffer message)
     {
+        bool messageSent = false;
         try
         {
             DBusConnection? connection = GetConnection(ifConnected: true);
-            if (connection is null)
-            {
-                message.ReturnToPool();
-                return false;
-            }
-            else
+            if (connection is not null)
             {
                 RefHandles(message);
                 connection.SendMessage(message);
-                return true;
+                messageSent = true;
             }
+            return messageSent;
         }
-        catch
+        finally
         {
-            message.ReturnToPool();
-            throw;
+            if (!messageSent)
+            {
+                message.ReturnToPool();
+            }
         }
     }
 

diff --git a/src/Tmds.DBus.Protocol/SocketExtensions.cs b/src/Tmds.DBus.Protocol/SocketExtensions.cs
@@ -129,7 +129,9 @@ private static unsafe int sendmsg(Socket socket, ReadOnlyMemory<byte> buffer, Un
                 finally
                 {
                     if (refAdded)
+                    {
                         handle.DangerousRelease();
+                    }
                 }
             }
         }
@@ -175,7 +177,9 @@ private static unsafe int recvmsg(Socket socket, Memory<byte> buffer, UnixFdColl
             finally
             {
                 if (refAdded)
+                {
                     handle.DangerousRelease();
+                }
             }
         }
     }