Skip to content

7.0 retry 2 #175

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
merged 2 commits into from
Jan 21, 2016
Merged

7.0 retry 2 #175

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d11e4f8
7.0 retry 2
Jan 20, 2016
551200a
is cancelled
Jan 21, 2016
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
33 changes: 14 additions & 19 deletions library/src/main/java/com/qiniu/android/storage/ResumeUploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,12 @@ private boolean isCancelled() {
}

private void nextTask(final int offset, final int retried, final URI address) {
if (isCancelled()) {
ResponseInfo i = ResponseInfo.cancelled();
completionHandler.complete(key, i, null);
return;
}

if (offset == size) {
CompletionHandler complete = new CompletionHandler() {
@Override
Expand All @@ -203,13 +209,7 @@ public void complete(ResponseInfo info, JSONObject response) {
return;
}

if (isCancelled()) {
ResponseInfo i = ResponseInfo.cancelled();
completionHandler.complete(key, i, null);
return;
}

if (isNotQiniu(info) || (info.needRetry() && retried < config.retryMax)) {
if ((isNotQiniu(info) || info.needRetry()) && retried < config.retryMax) {
nextTask(offset, retried + 1, config.upBackup.address);
return;
}
Expand All @@ -236,27 +236,22 @@ public void onProgress(int bytesWritten, int totalSize) {
@Override
public void complete(ResponseInfo info, JSONObject response) {
if (!info.isOK()) {
if (isCancelled()) {
ResponseInfo i = ResponseInfo.cancelled();
completionHandler.complete(key, i, null);
return;
}
if (info.statusCode == 701) {
nextTask((offset / Configuration.BLOCK_SIZE) * Configuration.BLOCK_SIZE, retried, address);
if (info.statusCode == 701 && retried < config.retryMax) {
nextTask((offset / Configuration.BLOCK_SIZE) * Configuration.BLOCK_SIZE, retried + 1, address);
return;
}

if (!isNotQiniu(info) && (retried >= config.retryMax || !info.needRetry())) {
completionHandler.complete(key, info, null);
if ((isNotQiniu(info) || info.needRetry()) && retried < config.retryMax) {
nextTask(offset, retried + 1, config.upBackup.address);
return;
}

nextTask(offset, retried + 1, config.upBackup.address);
completionHandler.complete(key, info, response);
return;
}
String context = null;

if (response == null) {
if (response == null && retried < config.retryMax) {
nextTask(offset, retried + 1, config.upBackup.address);
return;
}
Expand All @@ -267,7 +262,7 @@ public void complete(ResponseInfo info, JSONObject response) {
} catch (JSONException e) {
e.printStackTrace();
}
if (context == null || crc != ResumeUploader.this.crc32) {
if ((context == null || crc != ResumeUploader.this.crc32) && retried < config.retryMax) {
nextTask(offset, retried + 1, config.upBackup.address);
return;
}
Expand Down