Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions RestSharp.Tests/UrlBuilderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,17 @@ public void GET_with_resource_containing_tokens()
Assert.Equal(expected, output);
}

[Fact]
public void GET_with_resource_containing_null_token()
{
var request = new RestRequest("/resource/{foo}", Method.GET);
request.AddUrlSegment("foo", null);
var client = new RestClient("http://example.com/api/1.0");

var exception = Assert.Throws<ArgumentException>(() => client.BuildUri(request));
Assert.Contains("foo", exception.Message);
}

[Fact]
public void POST_with_resource_containing_tokens()
{
Expand Down
5 changes: 5 additions & 0 deletions RestSharp/RestClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,11 @@ public Uri BuildUri(IRestRequest request)
var urlParms = request.Parameters.Where(p => p.Type == ParameterType.UrlSegment);
foreach (var p in urlParms)
{
if (p.Value == null)
{
throw new ArgumentException(string.Format("Cannot build uri when url segment parameter '{0}' value is null.", p.Name), "request");
}

assembled = assembled.Replace("{" + p.Name + "}", p.Value.ToString().UrlEncode());
}

Expand Down