Further 0.9.1 updates

Unremove connection start mechanisms, generate exchange declare correctly

Author: Emile Joubert

projects/client/RabbitMQ.Client/src/client/api/IModel.cs

@@ -149,12 +149,12 @@ void ExchangeDeclare(string exchange,
                              string type,
                              bool passive,
                              bool durable,
-                             [AmqpUnsupported("RabbitMQ.Client.Framing.v0_9_1")]
+                             [AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9_1", "reserved2")]
                              bool autoDelete,
-                             [AmqpUnsupported("RabbitMQ.Client.Framing.v0_9_1")]
+                             [AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9_1", "reserved3")]
                              bool @internal,
                              [AmqpNowaitArgument(null)]
-                             [AmqpUnsupported("RabbitMQ.Client.Framing.v0_9_1")]
+                             [AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9_1", "noWait")]
                              bool nowait,
                              IDictionary arguments);
 
@@ -660,7 +660,6 @@ void HandleChannelClose(ushort replyCode,
         void HandleConnectionStart(byte versionMajor,
                                    byte versionMinor,
                                    IDictionary serverProperties,
-                                   [AmqpUnsupported("RabbitMQ.Client.Framing.v0_9_1")]
                                    byte[] mechanisms,
                                    byte[] locales);
 

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

@@ -303,7 +303,6 @@ public void TransmitAndEnqueue(Command cmd, IRpcContinuation k)
             }
             catch (AlreadyClosedException)
             {
-                int i = 1;
                 // Ignored, since the continuation will be told about
                 // the closure via an OperationInterruptedException because
                 // of the shutdown event propagation.
@@ -411,18 +410,6 @@ public void HandleConnectionStart(byte versionMajor,
                                           IDictionary serverProperties,
                                           byte[] mechanisms,
                                           byte[] locales)
-        {
-            HandleConnectionStart(versionMajor,
-                                  versionMinor,
-                                  serverProperties,
-                                  locales);
-            details.m_mechanisms = mechanisms;
-        }
-
-        public void HandleConnectionStart(byte versionMajor,
-                                          byte versionMinor,
-                                          IDictionary serverProperties,
-                                          byte[] locales)
         {
             if (m_connectionStartCell == null)
             {
@@ -436,6 +423,7 @@ public void HandleConnectionStart(byte versionMajor,
             details.m_versionMajor = versionMajor;
             details.m_versionMinor = versionMinor;
             details.m_serverProperties = serverProperties;
+            details.m_mechanisms = mechanisms;
             details.m_locales = locales;
             m_connectionStartCell.Value = details;
             m_connectionStartCell = null;