Fix ReplaceAll

ServiceStack · Aug 28, 2019 · 923e666 · 923e666
1 parent fee0f67
commit 923e666
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/ServiceStack.Text/StringExtensions.cs b/src/ServiceStack.Text/StringExtensions.cs
@@ -913,8 +913,9 @@ public static string ReplaceAll(this string haystack, string needle, string repl
         {
             int pos;
             // Avoid a possible infinite loop
-            if (needle == replacement) return haystack;
+            if (needle == replacement) 
-            while ((pos = haystack.IndexOf(needle, StringComparison.Ordinal)) > 0)
+                return haystack;
+            while ((pos = haystack.IndexOf(needle, StringComparison.Ordinal)) >= 0)
             {
                 haystack = haystack.Substring(0, pos)
                     + replacement

diff --git a/tests/ServiceStack.Text.Tests/StringExtensionsTests.cs b/tests/ServiceStack.Text.Tests/StringExtensionsTests.cs
@@ -355,5 +355,12 @@ public void Does_ContainsAny_Return_CaseInsensitive_Matches()
 
             Assert.That(input.ContainsAny(testMatches, StringComparison.OrdinalIgnoreCase));
         }
+
+        [Test]
+        public void Does_ReplaceAll_from_Start()
+        {
+            Assert.That("/images".ReplaceAll("/",""), Is.EqualTo("images"));
+        }
+
     }
 }