Another test fix for #85

Redth · Jan 29, 2013 · 35b531d · 35b531d
1 parent d6979f8
commit 35b531d
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/PushSharp.Apple/ApplePushChannel.cs b/PushSharp.Apple/ApplePushChannel.cs
@@ -72,6 +72,7 @@ public override PlatformType PlatformType
         }
 
 		object sentLock = new object();
+		object connectLock = new object();
 		object streamWriteLock = new object();
 		int reconnectDelay = 3000;
 		float reconnectBackoffMultiplier = 1.5f;
@@ -127,7 +128,8 @@ protected override void SendNotification(Common.Notification notification)
 
 				if (isOkToSend)
 				{
-					Connect();
+					lock(connectLock)
+						Connect();
 
 					try
 					{
@@ -264,6 +266,9 @@ void Cleanup()
 		{
 			while (true)
 			{
+				lock(connectLock)
+					Connect();
+
 				bool wasRemoved = false;
 
 				lock (sentLock)
@@ -272,7 +277,7 @@ void Cleanup()
 					if (sentNotifications.Count > 0)
 					{
 						//Don't expire any notifications while we are in a connecting state
-						if ((connected || CancelToken.IsCancellationRequested) || (!connected && QueuedNotificationCount <= 0))
+						if (connected || CancelToken.IsCancellationRequested)
 						{
 							//Get the oldest sent message
 							var n = sentNotifications[0];
@@ -307,7 +312,7 @@ void Cleanup()
 					Thread.Sleep(250);
 			}
 		}
-
+	
 		void Connect()
 		{
 			//Keep trying to connect