Merge pull request #128 from resnikb/stable

michaelklishin · michaelklishin · commit c800e8013cec · 2015-10-21T10:50:51.000+03:00
Fixing race condition with models in AutorecoveringConnection
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/AutorecoveringConnection.cs b/projects/client/RabbitMQ.Client/src/client/impl/AutorecoveringConnection.cs
@@ -539,7 +539,7 @@ public override string ToString()
 
         public void UnregisterModel(AutorecoveringModel model)
         {
-            lock (this)
+            lock (m_models)
             {
                 m_models.Remove(model);
             }
@@ -640,7 +640,7 @@ public IModel CreateModel()
             AutorecoveringModel m;
             m = new AutorecoveringModel(this,
                 CreateNonRecoveringModel());
-            lock (this)
+            lock (m_models)
             {
                 m_models.Add(m);
             }

Original file line number	Diff line number	Diff line change
`@@ -539,7 +539,7 @@ public override string ToString()`
`539`	`539`
`540`	`540`	`public void UnregisterModel(AutorecoveringModel model)`
`541`	`541`	`{`
`542`		`- lock (this)`
	`542`	`+ lock (m_models)`
`543`	`543`	`{`
`544`	`544`	`m_models.Remove(model);`
`545`	`545`	`}`
`@@ -640,7 +640,7 @@ public IModel CreateModel()`
`640`	`640`	`AutorecoveringModel m;`
`641`	`641`	`m = new AutorecoveringModel(this,`
`642`	`642`	`CreateNonRecoveringModel());`
`643`		`- lock (this)`
	`643`	`+ lock (m_models)`
`644`	`644`	`{`
`645`	`645`	`m_models.Add(m);`
`646`	`646`	`}`