[tomboy] Manage pendingCommits list properly.



commit b1efa51d314a43e8500ac8d37f14fb208d9e420f
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date:   Mon May 18 06:58:56 2009 -0700

    Manage pendingCommits list properly.
---
 Tomboy/Addins/WebSyncService/WebSyncServer.cs |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Tomboy/Addins/WebSyncService/WebSyncServer.cs b/Tomboy/Addins/WebSyncService/WebSyncServer.cs
index 8edd8fe..649e212 100644
--- a/Tomboy/Addins/WebSyncService/WebSyncServer.cs
+++ b/Tomboy/Addins/WebSyncService/WebSyncServer.cs
@@ -36,7 +36,9 @@ namespace Tomboy.WebSync
 	{
 		private string serverUrl;
 		private string userName;
+
 		private IAuthProvider auth;
+		
 		private UserInfo user;
 		private List<NoteInfo> pendingCommits;
 		
@@ -46,7 +48,6 @@ namespace Tomboy.WebSync
 			this.userName = userName;
 
 			auth = new BasicHttpAuthProvider (userName, password);
-			pendingCommits = new List<NoteInfo> ();
 		}
 
 		#region SyncServer implementation
@@ -55,12 +56,14 @@ namespace Tomboy.WebSync
 		{
 			// TODO: Check connection and auth
 			RefreshUser ();
+			pendingCommits = new List<NoteInfo> ();
 			return true;
 		}
 		
 		public bool CancelSyncTransaction ()
 		{
 			// TODO: Cancel any pending request
+			pendingCommits.Clear ();
 			return true;
 		}
 		
@@ -68,6 +71,7 @@ namespace Tomboy.WebSync
 		{
 			RefreshUser ();	// TODO: Test that latest sync rev hasn't changed
 			user.UpdateNotes (pendingCommits);
+			pendingCommits.Clear ();
 			// TODO: Check for problems
 			return true;
 		}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]