PublicationAddress.TryParse: return parsed value by reference

Author: michaelklishin

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

@@ -116,19 +116,23 @@ public static PublicationAddress Parse(string uriLikeString)
             return null;
         }
 
-        public static PublicationAddress TryParse(string uriLikeString)
+        public static bool TryParse(string uriLikeString, out PublicationAddress result)
         {
             // Callers such as IBasicProperties.ReplyToAddress
             // expect null result for invalid input.
             // The regex.Match() throws on null arguments so we perform explicit check here
             if (uriLikeString == null)
             {
-                return null;
+                result = null;
+                return false;
             } else {
                 try {
-                    return Parse(uriLikeString);
+                    var res = Parse(uriLikeString);
+                    result = res;
+                    return true;
                 } catch {
-                    return null;
+                    result = null;
+                    return false;
                 }
             }
         }

projects/RabbitMQ.Client/client/impl/BasicProperties.cs

@@ -115,7 +115,11 @@ public bool Persistent
         /// </summary>
         public PublicationAddress ReplyToAddress
         {
-            get { return PublicationAddress.TryParse(ReplyTo); }
+            get { 
+                PublicationAddress result;
+                PublicationAddress.TryParse(ReplyTo, out result);
+                return result;
+            }
             set { ReplyTo = value.ToString(); }
         }
 

projects/Unit/TestBasicProperties.cs

@@ -135,7 +135,9 @@ public void TestProperties_ReplyTo(
 
             // Assert
             bool isReplyToPresent = replyTo != null;
-            string replyToAddress = PublicationAddress.TryParse(replyTo)?.ToString();
+            PublicationAddress result;
+            PublicationAddress.TryParse(replyTo, out result);
+            string replyToAddress = result?.ToString();
             Assert.AreEqual(isReplyToPresent, subject.IsReplyToPresent());
 
             var writer = new Impl.ContentHeaderPropertyWriter(new byte[1024]);

projects/Unit/TestPublicationAddress.cs

@@ -71,9 +71,15 @@ public void TestParseFailWithUnparseableInput()
         [Test]
         public void TestTryParseFail()
         {
-            Assert.IsNull(PublicationAddress.TryParse(null));
-            Assert.IsNull(PublicationAddress.TryParse("not a valid URI"));
-            Assert.IsNull(PublicationAddress.TryParse("}}}}}}}}"));
+            PublicationAddress result;
+            PublicationAddress.TryParse(null, out result);
+            Assert.IsNull(result);
+
+            PublicationAddress.TryParse("not a valid URI", out result);
+            Assert.IsNull(result);
+
+            PublicationAddress.TryParse("}}}}}}}}", out result);
+            Assert.IsNull(result);
         }
 
         [Test]