Merge 22653 into default.

Author: Simon MacMullen

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

@@ -88,8 +88,8 @@ namespace RabbitMQ.Client
     ///     //
     ///     // ... use ch's IModel methods ...
     ///     //
-    ///     ch.Close(200, "Closing the channel");
-    ///     conn.Close(200, "Closing the connection");
+    ///     ch.Close(Constants.ReplySuccess, "Closing the channel");
+    ///     conn.Close(Constants.ReplySuccess, "Closing the connection");
     ///</code></example>
     ///<para>
     /// Please see also the API overview and tutorial in the User Guide.

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

@@ -370,7 +370,7 @@ void IDisposable.Dispose()
         ///<summary>API-side invocation of connection close.</summary>
         public void Close()
         {
-            Close(200, "Goodbye", Timeout.Infinite);
+            Close(CommonFraming.Constants.ReplySuccess, "Goodbye", Timeout.Infinite);
         }
 
         ///<summary>API-side invocation of connection close.</summary>
@@ -382,7 +382,7 @@ public void Close(ushort reasonCode, string reasonText)
         ///<summary>API-side invocation of connection close with timeout.</summary>
         public void Close(int timeout)
         {
-            Close(200, "Goodbye", timeout);
+            Close(CommonFraming.Constants.ReplySuccess, "Goodbye", timeout);
         }
 
         ///<summary>API-side invocation of connection close with timeout.</summary>
@@ -411,7 +411,7 @@ public void Abort(ushort reasonCode, string reasonText)
         ///<summary>API-side invocation of connection abort with timeout.</summary>
         public void Abort(int timeout)
         {
-            Abort(200, "Connection close forced", timeout);
+            Abort(CommonFraming.Constants.ReplySuccess, "Connection close forced", timeout);
         }
 
         ///<summary>API-side invocation of connection abort with timeout.</summary>

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

@@ -57,6 +57,7 @@
 using System;
 using System.IO;
 using System.Collections;
+using System.Diagnostics;
 using System.Threading;
 
 using RabbitMQ.Client;
@@ -69,7 +70,6 @@
 // we support*. Obviously we may need to revisit this if that ever
 // changes.
 using CommonFraming = RabbitMQ.Client.Framing.v0_9;
-using System.Diagnostics;
 
 namespace RabbitMQ.Client.Impl
 {
@@ -808,7 +808,7 @@ void IDisposable.Dispose()
 
         public void Close()
         {
-        	Close(200, "Goodbye");
+        	Close(CommonFraming.Constants.ReplySuccess, "Goodbye");
         }
 
 		public void Close(ushort replyCode, string replyText)
@@ -818,7 +818,7 @@ public void Close(ushort replyCode, string replyText)
 
         public void Abort() 
         {
-            Abort(200, "Goodbye");
+            Abort(CommonFraming.Constants.ReplySuccess, "Goodbye");
         }
 
         public void Abort(ushort replyCode, string replyText)

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

@@ -62,6 +62,12 @@
 using RabbitMQ.Client.Exceptions;
 using RabbitMQ.Util;
 
+// We use spec version 0-9 for common constants such as frame types,
+// error codes, and the frame end byte, since they don't vary *within
+// the versions we support*. Obviously we may need to revisit this if
+// that ever changes.
+using CommonFraming = RabbitMQ.Client.Framing.v0_9;
+
 namespace RabbitMQ.Client.Impl
 {
     public class SessionManager
@@ -203,7 +209,7 @@ public void CheckAutoClose()
         ///when we decide to close the connection.</summary>
         public void AutoCloseConnection()
         {
-            m_connection.Abort(200, "AutoClose", ShutdownInitiator.Library, Timeout.Infinite);
+            m_connection.Abort(CommonFraming.Constants.ReplySuccess, "AutoClose", ShutdownInitiator.Library, Timeout.Infinite);
         }
     }
 }

projects/wcf/RabbitMQ.ServiceModel/src/serviceModel/CurrentVersion.cs

@@ -63,6 +63,12 @@ namespace RabbitMQ.ServiceModel
     using System;
     using System.Text;
 
+    // We use spec version 0-9 for common constants such as frame types,
+    // error codes, and the frame end byte, since they don't vary *within
+    // the versions we support*. Obviously we may need to revisit this if
+    // that ever changes.
+    using CommonFraming = RabbitMQ.Client.Framing.v0_9;
+
     /// <summary>
     /// Properties of the current RabbitMQ Service Model Version
     /// </summary>
@@ -74,7 +80,7 @@ public static class CurrentVersion
 
         internal static class StatusCodes
         {
-            public const int Ok = 200;
+            public const int Ok = CommonFraming.Constants.ReplySuccess;
         }
 
     }

projects/wcf/RabbitMQ.ServiceModel/src/serviceModel/RabbitMQInputChannel.cs

@@ -69,6 +69,12 @@ namespace RabbitMQ.ServiceModel
     using RabbitMQ.Client;
     using RabbitMQ.Client.Events;
 
+    // We use spec version 0-9 for common constants such as frame types,
+    // error codes, and the frame end byte, since they don't vary *within
+    // the versions we support*. Obviously we may need to revisit this if
+    // that ever changes.
+    using CommonFraming = RabbitMQ.Client.Framing.v0_9;
+
     internal sealed class RabbitMQInputChannel : RabbitMQInputChannelBase
     {
         private RabbitMQTransportBindingElement m_bindingElement;
@@ -109,7 +115,7 @@ public override Message Receive(TimeSpan timeout)
             }
             catch (EndOfStreamException)
             {
-                if (m_messageQueue== null || m_messageQueue.ShutdownReason != null && m_messageQueue.ShutdownReason.ReplyCode != 200)
+                if (m_messageQueue== null || m_messageQueue.ShutdownReason != null && m_messageQueue.ShutdownReason.ReplyCode != CommonFraming.Constants.ReplySuccess)
                 {
                     OnFaulted();
                 }