Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(415)

Unified Diff: editor/tools/plugins/com.google.dart.tools.update.core/src/com/google/dart/tools/update/core/internal/DownloadManager.java

Issue 10660016: Update manager fixes to handle update check failures. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: editor/tools/plugins/com.google.dart.tools.update.core/src/com/google/dart/tools/update/core/internal/DownloadManager.java
===================================================================
--- editor/tools/plugins/com.google.dart.tools.update.core/src/com/google/dart/tools/update/core/internal/DownloadManager.java (revision 9083)
+++ editor/tools/plugins/com.google.dart.tools.update.core/src/com/google/dart/tools/update/core/internal/DownloadManager.java (working copy)
@@ -157,11 +157,13 @@
private void doCheckForUpdate() {
- //TODO(pquitslund): sysout for debgging
- System.out.println("UpdateManager.doCheckForUpdate()");
+ //TODO(pquitslund): sysout for debugging
+ System.out.println("DownloadManager.doCheckForUpdate()");
//ensure jobs don't stack
if (updateJob != null) {
+ //TODO(pquitslund): sysout for debugging
+ System.out.println("(update job active -- check canceled)");
return;
}
@@ -170,17 +172,25 @@
@Override
public void done(IJobChangeEvent event) {
Revision latest = ((CheckForUpdatesJob) updateJob).getLatest();
- model.setLatestAvailableRevision(latest);
+ if (latest == null) {
+ model.setErrorMessage(((CheckForUpdatesJob) updateJob).getErrorMessage());
+ model.enterState(State.FAILED);
+ } else {
+
+ model.setLatestAvailableRevision(latest);
+ model.enterState(State.CHECKED);
+
+ Revision staged = getLatestStaged();
+ if (latest.isMoreCurrentThan(UpdateCore.getCurrentRevision())) {
+ model.enterState(State.AVAILABLE);
+ }
+ if (latest.isEqualTo(staged)) {
+ model.enterState(State.DOWNLOADED);
+ }
+ }
+
updateJob = null;
- model.enterState(State.CHECKED);
- Revision staged = getLatestStaged();
- if (latest.isMoreCurrentThan(UpdateCore.getCurrentRevision())) {
- model.enterState(State.AVAILABLE);
- }
- if (latest.isEqualTo(staged)) {
- model.enterState(State.DOWNLOADED);
- }
}
@Override

Powered by Google App Engine
This is Rietveld 408576698