From eb2bbc581c08293caf63fdbeeb339d60867e3e6d Mon Sep 17 00:00:00 2001 From: Alexander Radchenko Date: Mon, 14 Nov 2016 18:17:00 +0700 Subject: [PATCH] Fixed Join(string separator, params object[] values) method Fixed Join(string separator, params object[] values) method. Calling string.Join(",", null, 1, 2, 3); return empty string but should ",1,2,3". --- .../src/System/String.Manipulation.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/System.Private.CoreLib/src/System/String.Manipulation.cs b/src/System.Private.CoreLib/src/System/String.Manipulation.cs index a69a2ae075e..9db19b0b43d 100644 --- a/src/System.Private.CoreLib/src/System/String.Manipulation.cs +++ b/src/System.Private.CoreLib/src/System/String.Manipulation.cs @@ -484,15 +484,13 @@ public static string Join(string separator, params object[] values) if (values == null) throw new ArgumentNullException(nameof(values)); - if (values.Length == 0 || values[0] == null) + if (values.Length == 0) return string.Empty; - string firstString = values[0].ToString(); + string firstString = values[0]?.ToString(); if (values.Length == 1) - { return firstString ?? string.Empty; - } StringBuilder result = StringBuilderCache.Acquire(); result.Append(firstString);