Skip to content

Commit 0b83029

Browse files
committed
Merge pull request #242 from wooldridge/20160414-code-cleanup
remove unnecessary code in requester.js
2 parents 0c60e4c + 10abbe7 commit 0b83029

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

lib/requester.js

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -159,30 +159,24 @@ function authenticatedRequest(operation, authenticator, requester) {
159159
} else {
160160
requester.call(operation, request);
161161
}
162-
return request;
163162
}
164163

165164
function singleRequester(request) {
166165
/*jshint validthis:true */
167166
var operation = this;
168167

169-
var requestBodyProvider = operation.requestBodyProvider;
170-
if (typeof requestBodyProvider === 'function') {
171-
requestBodyProvider.call(operation, request);
168+
var requestSource = mlutil.marshal(operation.requestBody);
169+
if (requestSource == null) {
170+
request.end();
171+
} else if (typeof requestSource === 'string' || requestSource instanceof String) {
172+
request.write(requestSource, 'utf8');
173+
request.end();
174+
// readable stream might not inherit from ReadableStream
175+
} else if (typeof requestSource._read === 'function') {
176+
requestSource.pipe(request);
172177
} else {
173-
var requestSource = mlutil.marshal(operation.requestBody);
174-
if (requestSource == null) {
175-
request.end();
176-
} else if (typeof requestSource === 'string' || requestSource instanceof String) {
177-
request.write(requestSource, 'utf8');
178-
request.end();
179-
// readable stream might not inherit from ReadableStream
180-
} else if (typeof requestSource._read === 'function') {
181-
requestSource.pipe(request);
182-
} else {
183-
request.write(requestSource);
184-
request.end();
185-
}
178+
request.write(requestSource);
179+
request.end();
186180
}
187181
}
188182
function multipartRequester(request) {

0 commit comments

Comments
 (0)