Merge branch 'stable'

michaelklishin · michaelklishin · commit 5551ef33ff4a · 2015-10-21T10:51:19.000+03:00
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/AutorecoveringConnection.cs b/projects/client/RabbitMQ.Client/src/client/impl/AutorecoveringConnection.cs
@@ -537,7 +537,7 @@ public override string ToString()
 
         public void UnregisterModel(AutorecoveringModel model)
         {
-            lock (this)
+            lock (m_models)
             {
                 m_models.Remove(model);
             }
@@ -672,7 +672,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
`@@ -537,7 +537,7 @@ public override string ToString()`
`537`	`537`
`538`	`538`	`public void UnregisterModel(AutorecoveringModel model)`
`539`	`539`	`{`
`540`		`- lock (this)`
	`540`	`+ lock (m_models)`
`541`	`541`	`{`
`542`	`542`	`m_models.Remove(model);`
`543`	`543`	`}`
`@@ -672,7 +672,7 @@ public IModel CreateModel()`
`672`	`672`	`AutorecoveringModel m;`
`673`	`673`	`m = new AutorecoveringModel(this,`
`674`	`674`	`CreateNonRecoveringModel());`
`675`		`- lock (this)`
	`675`	`+ lock (m_models)`
`676`	`676`	`{`
`677`	`677`	`m_models.Add(m);`
`678`	`678`	`}`