Revision 2115e2a5 trunk/Pithos.Core/Agents/PollAgent.cs
| b/trunk/Pithos.Core/Agents/PollAgent.cs | ||
|---|---|---|
| 644 | 644 |
if ((tuple.C == null || !localInfo.Exists) && tuple.ObjectInfo != null) |
| 645 | 645 |
{
|
| 646 | 646 |
//deleteObjectFromServer() |
| 647 |
DeleteCloudFile(accountInfo, tuple); |
|
| 647 |
await DeleteCloudFile(accountInfo, tuple);
|
|
| 648 | 648 |
//updateRecord( Remove L, S) |
| 649 | 649 |
} |
| 650 | 650 |
else |
| ... | ... | |
| 711 | 711 |
if ((tuple.C == null || !localInfo.Exists) && tuple.ObjectInfo != null) |
| 712 | 712 |
{
|
| 713 | 713 |
//deleteObjectFromServer() |
| 714 |
DeleteCloudFile(accountInfo, tuple); |
|
| 714 |
await DeleteCloudFile(accountInfo, tuple);
|
|
| 715 | 715 |
//updateRecord(Remove L, S) |
| 716 | 716 |
} |
| 717 | 717 |
//If both the local and server files are missing, the state is stale |
| ... | ... | |
| 924 | 924 |
return serverPath; |
| 925 | 925 |
} |
| 926 | 926 |
|
| 927 |
private void DeleteCloudFile(AccountInfo accountInfo, StateTuple tuple)
|
|
| 927 |
private async Task DeleteCloudFile(AccountInfo accountInfo, StateTuple tuple)
|
|
| 928 | 928 |
{
|
| 929 | 929 |
using (StatusNotification.GetNotifier("Deleting server {0}", "Deleted server {0}", true,Path.GetFileName(tuple.FilePath)))
|
| 930 | 930 |
{
|
| 931 | 931 |
|
| 932 | 932 |
StatusKeeper.SetFileState(tuple.FilePath, FileStatus.Deleted, |
| 933 | 933 |
FileOverlayStatus.Deleted, ""); |
| 934 |
NetworkAgent.DeleteAgent.DeleteCloudFile(accountInfo, tuple.ObjectInfo); |
|
| 934 |
await NetworkAgent.DeleteAgent.DeleteCloudFile(accountInfo, tuple.ObjectInfo);
|
|
| 935 | 935 |
StatusKeeper.ClearFileStatus(tuple.FilePath); |
| 936 | 936 |
} |
| 937 | 937 |
} |
Also available in: Unified diff