Merge change 3228 into donut

* changes:
  ADT: make sure to log exceptions that might happen when loading the SDK.
This commit is contained in:
Android (Google) Code Review
2009-06-04 17:48:15 -07:00

View File

@@ -987,9 +987,9 @@ public class AdtPlugin extends AbstractUIPlugin {
return Status.OK_STATUS;
} catch (Throwable t) {
log(t, "pingUsageServer failed"); //$NON-NLS-1$
log(t, "pingUsageServer failed"); //$NON-NLS-1$
return new Status(IStatus.ERROR, PLUGIN_ID,
"pingUsageServer failed", t);
"pingUsageServer failed", t); //$NON-NLS-1$
}
}
};
@@ -1096,6 +1096,11 @@ public class AdtPlugin extends AbstractUIPlugin {
}
}
});
} catch (Throwable t) {
log(t, "Unknown exception in parseSdkContent."); //$NON-NLS-1$
return new Status(IStatus.ERROR, PLUGIN_ID,
"parseSdkContent failed", t); //$NON-NLS-1$
} finally {
mSdkIsLoading = false;
if (monitor != null) {