Skip to content

Commit e940ddf

Browse files
Changes following review
1 parent 1f27750 commit e940ddf

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

src/System.Web.Http/Batch/DefaultHttpBatchHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public virtual async Task<IList<HttpRequestMessage>> ParseBatchRequestsAsync(Htt
187187
foreach (HttpContent httpContent in streamProvider.Contents)
188188
{
189189
cancellationToken.ThrowIfCancellationRequested();
190-
HttpRequestMessage innerRequest = await httpContent.ReadAsHttpRequestMessageAsync(request.RequestUri.Scheme);
190+
HttpRequestMessage innerRequest = request.RequestUri == null ? await httpContent.ReadAsHttpRequestMessageAsync() : await httpContent.ReadAsHttpRequestMessageAsync(request.RequestUri.Scheme);
191191
innerRequest.CopyBatchRequestProperties(request);
192192
requests.Add(innerRequest);
193193
}

test/System.Web.Http.Test/Batch/DefaultHttpBatchHandlerTest.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@ public async Task ProcessBatchAsync_CallsRegisterForDispose()
102102
{
103103
new HttpMessageContent(new HttpRequestMessage(HttpMethod.Get, "http://example.com/")),
104104
new HttpMessageContent(new HttpRequestMessage(HttpMethod.Post, "http://example.org/"))
105-
},
106-
RequestUri = new Uri("http://example.com/")
105+
}
107106
};
108107

109108
var response = await batchHandler.ProcessBatchAsync(batchRequest, CancellationToken.None);
@@ -270,8 +269,7 @@ public async Task ParseBatchRequestsAsync_Returns_RequestsFromMultipartContent()
270269
{
271270
new HttpMessageContent(new HttpRequestMessage(HttpMethod.Get, "http://example.com/")),
272271
new HttpMessageContent(new HttpRequestMessage(HttpMethod.Post, "http://example.com/values"))
273-
},
274-
RequestUri = new Uri("http://example.com/")
272+
}
275273
};
276274

277275
IList<HttpRequestMessage> requests = await batchHandler.ParseBatchRequestsAsync(request, CancellationToken.None);
@@ -316,8 +314,7 @@ public async Task ParseBatchRequestsAsync_CopiesPropertiesFromRequest_WithoutExc
316314
{
317315
new HttpMessageContent(new HttpRequestMessage(HttpMethod.Get, "http://example.com/")),
318316
new HttpMessageContent(new HttpRequestMessage(HttpMethod.Post, "http://example.com/values"))
319-
},
320-
RequestUri = new Uri("http://example.com/")
317+
}
321318
};
322319
request.Properties.Add("foo", "bar");
323320
request.SetRouteData(new HttpRouteData(new HttpRoute()));

test/System.Web.Http.WebHost.Test/BatchingTest.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ public async Task WebHost_Batching_WithSpecialCharactersInUrl()
4343
Content = new MultipartContent("mixed")
4444
{
4545
new HttpMessageContent(new HttpRequestMessage(HttpMethod.Post, "http://contoso.com/values/ space"))
46-
},
47-
RequestUri = new Uri("http://contoso.com/")
46+
}
4847
};
4948

5049
// Arrange

0 commit comments

Comments
 (0)