Merged bug 22840

Author: Simon MacMullen

projects/client/RabbitMQ.Client/src/client/exceptions/ProtocolVersionMismatchException.cs

@@ -75,14 +75,18 @@ public class ProtocolVersionMismatchException: System.Net.ProtocolViolationExcep
         ///<summary>The peer's AMQP specification minor version.</summary>
         public int ServerMinor { get { return m_serverMinor; } }
 
+        private static String positiveOrUnknown(int version){
+            return version >= 0 ? version.ToString() : "unknown";
+        }
+
         ///<summary>Fills the new instance's properties with the values passed in.</summary>
         public ProtocolVersionMismatchException(int clientMajor,
                                                 int clientMinor,
                                                 int serverMajor,
                                                 int serverMinor)
             : base("AMQP server protocol negotiation failure: server version "+
-                   serverMajor + "-" + serverMinor +
-                   ", client version " + clientMajor + "-" + clientMinor)
+                   positiveOrUnknown(serverMajor) + "-" + positiveOrUnknown(serverMinor) +
+                   ", client version " + positiveOrUnknown(clientMajor) + "-" + positiveOrUnknown(clientMinor))
         {
             m_clientMajor = clientMajor;
             m_clientMinor = clientMinor;

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

@@ -977,6 +977,12 @@ public void Open(bool insist)
 
             ConnectionStartDetails connectionStart = (ConnectionStartDetails)
                 connectionStartCell.Value;
+            
+            if (connectionStart == null){
+                throw new ProtocolVersionMismatchException(Protocol.MajorVersion,
+                                                           Protocol.MinorVersion,
+                                                           -1, -1);
+            }
 
             ServerProperties = connectionStart.m_serverProperties;
 

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

@@ -482,6 +482,10 @@ public void FinishClose()
             {
                 m_session.Close(m_closeReason);
             }
+            if (m_connectionStartCell != null)
+            {
+                m_connectionStartCell.Value = null;
+            }
         }
 
         ///////////////////////////////////////////////////////////////////////////