Merge branch 'stable'

Author: michaelklishin

projects/client/Apigen/src/apigen/Apigen.cs

@@ -133,7 +133,7 @@ public static IList<string> IdentifierParts(string name) {
         public static string MangleClass(string name) {
             StringBuilder sb = new StringBuilder();
             foreach (String s in IdentifierParts(name)) {
-                sb.Append(Char.ToUpper(s[0]) + s.Substring(1).ToLower());
+                sb.Append(Char.ToUpperInvariant(s[0]) + s.Substring(1).ToLowerInvariant());
             }
             return sb.ToString();
         }
@@ -143,9 +143,9 @@ public static string MangleMethod(string name) {
             bool useUpper = false;
             foreach (String s in IdentifierParts(name)) {
                 if (useUpper) {
-                    sb.Append(Char.ToUpper(s[0]) + s.Substring(1).ToLower());
+                    sb.Append(Char.ToUpperInvariant(s[0]) + s.Substring(1).ToLowerInvariant());
                 } else {
-                    sb.Append(s.ToLower());
+                    sb.Append(s.ToLowerInvariant());
                     useUpper = true;
                 }
             }

projects/client/RabbitMQ.Client/src/client/impl/AutorecoveringConnection.cs

@@ -691,7 +691,13 @@ public void HandleConnectionUnblocked()
 
         void IDisposable.Dispose()
         {
-            Abort();
+            try {
+                Abort();
+            }
+            finally
+            {
+                m_models.Clear();
+            }
             if (ShutdownReport.Count > 0)
             {
                 foreach (ShutdownReportEntry entry in ShutdownReport)

projects/client/RabbitMQ.Client/src/client/impl/AutorecoveringModel.cs

@@ -373,7 +373,7 @@ public override string ToString()
 
         void IDisposable.Dispose()
         {
-            m_delegate.Close();
+            Abort();
         }
 
         public void ConnectionTuneOk(ushort channelMax,