avoid locking on this reference (Azure#382)

florin141 · Aug 26, 2019 · 9b40a87 · 9b40a87
1 parent 7fe8bc7
commit 9b40a87
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/Connection.cs b/src/Connection.cs
@@ -67,6 +67,7 @@ enum State
         ITransport writer;
         Pump reader;
         HeartBeat heartBeat;
+        private readonly object lockObject = new object();
 
         Connection(Address address, ushort channelMax, uint maxFrameSize)
         {
@@ -137,7 +138,7 @@ public IHandler Handler
 
         object ThisLock
         {
-            get { return this; }
+            get { return this.lockObject; }
         }
 
 #if NETFX || NETFX40 || DOTNET || NETFX_CORE || WINDOWS_STORE || WINDOWS_PHONE

diff --git a/src/Link.cs b/src/Link.cs
@@ -44,6 +44,7 @@ public abstract partial class Link : AmqpObject
         readonly OnAttached onAttached;
         LinkState state;
         bool detach;
+        private readonly object lockObject = new object();
 
         /// <summary>
         /// Initializes the link.
@@ -96,7 +97,7 @@ public Session Session
 
         internal object ThisLock
         {
-            get { return this; }
+            get { return this.lockObject; }
         }
 
         internal bool IsDetaching

diff --git a/src/Session.cs b/src/Session.cs
@@ -47,6 +47,8 @@ enum State
         Link[] localLinks;
         Link[] remoteLinks;
         State state;
+        private readonly object lockObject = new object();
+
 
         // incoming flow control
         SequenceNumber incomingDeliveryId;
@@ -104,7 +106,7 @@ public Connection Connection
 
         object ThisLock
         {
-            get { return this; }
+            get { return this.lockObject; }
         }
 
         internal ushort Channel