Skip to content

[#396] OneDrive Chunked Upload - Chunk size is not taken into consideration in case of customized input stream #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baywet merged 3 commits into from
Aug 19, 2020
Merged

[#396] OneDrive Chunked Upload - Chunk size is not taken into consideration in case of customized input stream #397

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
145c0e8
[#396] Continue to read from the input stream to make sure the buffer…
Jul 15, 2020
bc0bd86
Rescope the read variable to be local to the inner while loop.
Jul 30, 2020
795362a
add comment
zengin Jul 30, 2020
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
18 changes: 12 additions & 6 deletions src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,20 @@ public void upload(final List<Option> options,
byte[] buffer = new byte[chunkSize];

while (this.readSoFar < this.streamSize) {
int read = this.inputStream.read(buffer);

if (read == -1) {
break;
int buffRead = 0;

// inner loop is to work-around the case where read buffer size is limited to less than chunk size by a global setting
while (buffRead < chunkSize) {
int read = 0;
read = this.inputStream.read(buffer, buffRead, chunkSize - buffRead);
if (read == -1) {
break;
}
buffRead += read;
}

ChunkedUploadRequest request =
new ChunkedUploadRequest(this.uploadUrl, this.client, options, buffer, read,
new ChunkedUploadRequest(this.uploadUrl, this.client, options, buffer, buffRead,
maxRetry, this.readSoFar, this.streamSize);
ChunkedUploadResult<UploadType> result = request.upload(this.responseHandler);

Expand All @@ -190,7 +196,7 @@ public void upload(final List<Option> options,
break;
}

this.readSoFar += read;
this.readSoFar += buffRead;
}
}

Expand Down