Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson
2018-07-16 11:07:12 +01:00
3 changed files with 30 additions and 4 deletions

View File

@@ -138,10 +138,10 @@ public class UriModifyingOperationPreprocessor implements OperationPreprocessor
HttpHeaders modifiedHeaders = modify(request.getHeaders());
modifiedHeaders.set(HttpHeaders.HOST, modifiedUri.getHost()
+ (modifiedUri.getPort() == -1 ? "" : ":" + modifiedUri.getPort()));
return this.contentModifyingDelegate.preprocess(
new OperationRequestFactory().create(uriBuilder.build(true).toUri(),
request.getMethod(), request.getContent(), modifiedHeaders,
request.getParameters(), modify(request.getParts())));
return this.contentModifyingDelegate.preprocess(new OperationRequestFactory()
.create(uriBuilder.build(true).toUri(), request.getMethod(),
request.getContent(), modifiedHeaders, request.getParameters(),
modify(request.getParts()), request.getCookies()));
}
@Override