icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-15 20:54:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fixed bug in IcdUriBuilder where Query property behaved differently to UriBuilder

Browse Source
This commit is contained in:
Chris Cameron
2019-06-21 21:32:46 -04:00
parent d3d812265e
commit e8acb42bb9
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ICD.Common.Utils/IcdUriBuilder.cs
View File

@@ -13,6 +13,8 @@ namespace ICD.Common.Utils
/// </summary>
public sealed class IcdUriBuilder
{
private string m_Query;
#region Properties
/// <summary>
@@ -43,7 +45,7 @@ namespace ICD.Common.Utils
/// <summary>
/// Gets or sets any query information included in the URI.
/// </summary>
public string Query { get; set; }
public string Query { get { return m_Query == null ? null : "?" + m_Query; } set { m_Query = value; } }
/// <summary>
/// Gets or sets the scheme name of the URI.
@@ -96,7 +98,7 @@ namespace ICD.Common.Utils
Password = uri.GetPassword();
Path = uri.AbsolutePath;
Port = (ushort)uri.Port;
Query = uri.Query;
Query = uri.Query == null ? null : uri.Query.TrimStart('?');
Scheme = uri.Scheme;
UserName = uri.GetUserName();
}
@@ -149,10 +151,7 @@ namespace ICD.Common.Utils
// Query
if (!string.IsNullOrEmpty(Query))
{
builder.Append('?');
builder.Append(Query);
}
// Fragment
if (!string.IsNullOrEmpty(Fragment))