treat null path as "" in CombineWith

mythz · mythz · commit cde2546431f3 · 2014-03-15T16:03:33.000-04:00
diff --git a/src/ServiceStack.Text/PathUtils.cs b/src/ServiceStack.Text/PathUtils.cs
@@ -84,6 +84,9 @@ public static string AssertDir(this string dirPath)
 
         public static string CombineWith(this string path, params string[] thesePaths)
         {
+            if (path == null)
+                path = "";
+
             if (thesePaths.Length == 1 && thesePaths[0] == null) return path;
             var startPath = path.Length > 1 ? path.TrimEnd('/', '\\') : path;
             return CombinePaths(new StringBuilder(startPath), thesePaths);

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,9 @@ public static string AssertDir(this string dirPath)`
`84`	`84`
`85`	`85`	`public static string CombineWith(this string path, params string[] thesePaths)`
`86`	`86`	`{`
	`87`	`+ if (path == null)`
	`88`	`+ path = "";`
	`89`	`+`
`87`	`90`	`if (thesePaths.Length == 1 && thesePaths[0] == null) return path;`
`88`	`91`	`var startPath = path.Length > 1 ? path.TrimEnd('/', '\\') : path;`
`89`	`92`	`return CombinePaths(new StringBuilder(startPath), thesePaths);`