* Ensure AmqpString equality or comparison does not trigger string init

Author: lukebakken

projects/RabbitMQ.Client/client/api/AmqpString.cs

@@ -156,9 +156,9 @@ public override bool Equals(object obj)
 
         public bool Equals(AmqpString other)
         {
-            if (_value == null)
+            if (_value is null || other._value is null)
             {
-                return _stringBytes.Equals(other._stringBytes);
+                return GetHashCode().Equals(other.GetHashCode());
             }
             else
             {
@@ -168,19 +168,12 @@ public bool Equals(AmqpString other)
 
         public override int GetHashCode()
         {
-            if (_value == null)
-            {
-                return ReadOnlyMemoryOfByteEqualityComparer.CalculateHashCode(_stringBytes);
-            }
-            else
-            {
-                return _value.GetHashCode();
-            }
+            return ReadOnlyMemoryOfByteEqualityComparer.CalculateHashCode(_stringBytes);
         }
 
         public int CompareTo(AmqpString other)
         {
-            if (_value == null)
+            if (_value is null || other._value is null)
             {
                 return GetHashCode().CompareTo(other.GetHashCode());
             }

projects/RabbitMQ.Client/client/api/ExchangeType.cs

@@ -36,7 +36,7 @@
 namespace RabbitMQ.Client
 {
     /// <summary>
-    /// Convenience struct providing compile-time names for standard exchange types.
+    /// Convenience class providing compile-time names for standard exchange types.
     /// </summary>
     /// <remarks>
     /// Use the static members of this class as values for the

projects/Test/Unit/TestAmqpString.cs

@@ -140,5 +140,19 @@ public void TestEqualityWhenUsingReadOnlyMemoryOfByte()
             var ex2 = new ExchangeName(b2);
             Assert.Equal(ex1, ex2);
         }
+
+        [Fact]
+        public void TestEqualityWhenUsingMixOfReadOnlyMemoryOfByteAndString()
+        {
+            ReadOnlyMemory<byte> b1 = new byte[] { (byte)'f', (byte)'o', (byte)'o' };
+            var ex1 = new ExchangeName(b1);
+
+            string b2str = "foo";
+            var ex2 = new ExchangeName(b2str);
+
+            Assert.Equal(ex1, ex2);
+            Assert.Equal(ex1, b2str);
+            Assert.Equal(ex2, b2str);
+        }
     }
 }