|
|
|
@ -1254,7 +1254,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
|
|
|
|
|
EntityLog.log(
|
|
|
|
|
ServiceSynchronize.this,
|
|
|
|
|
folder.name + " " + Log.formatThrowable(ex, false));
|
|
|
|
|
state.error(new FolderClosedException(ifolder, "IDLE"));
|
|
|
|
|
state.error(new FolderClosedException(ifolder, "IDLE", new Exception(ex)));
|
|
|
|
|
} finally {
|
|
|
|
|
Log.i(folder.name + " end idle");
|
|
|
|
|
}
|
|
|
|
@ -1469,13 +1469,11 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
|
|
|
|
|
" Tune interval=" + account.poll_interval +
|
|
|
|
|
" idle=" + idleTime + "/" + tune);
|
|
|
|
|
try {
|
|
|
|
|
if (!state.isRecoverable()) {
|
|
|
|
|
Throwable ex = state.getUnrecoverable();
|
|
|
|
|
if (ex instanceof Exception)
|
|
|
|
|
throw new StoreClosedException(iservice.getStore(), "Unrecoverable", (Exception) ex);
|
|
|
|
|
else
|
|
|
|
|
throw new StoreClosedException(iservice.getStore(), "Unrecoverable");
|
|
|
|
|
}
|
|
|
|
|
if (!state.isRecoverable())
|
|
|
|
|
throw new StoreClosedException(
|
|
|
|
|
iservice.getStore(),
|
|
|
|
|
"Unrecoverable",
|
|
|
|
|
new Exception(state.getUnrecoverable()));
|
|
|
|
|
|
|
|
|
|
// Sends store NOOP
|
|
|
|
|
EntityLog.log(ServiceSynchronize.this, account.name + " checking store");
|
|
|
|
|