Changeset 13943 for branches/thasling/DistributedGA/DistributedGA.Core/Implementation/WcfPeerListManager.cs

Timestamp:

06/28/16 17:03:36 (8 years ago)

Author:

thasling

Message:

#2615:
implemented lock for timers, because if elapsed-method takes longer than the timer to elapse again, the method is called by another thread conccurently

File:

• branches/thasling/DistributedGA/DistributedGA.Core/Implementation/WcfPeerListManager.cs (modified) (3 diffs)

branches/thasling/DistributedGA/DistributedGA.Core/Implementation/WcfPeerListManager.cs

@@ -15 +15 @@
 
     private Timer timer = null; //sends heartbeat to contact-server
+
+    private Object timerLock = new Object();
 
     private ChannelFactory<IContactService> myChannelFactory;
@@ -73 +75 @@
         res.Add(allPeers.ElementAt(index));
       }
-      return res;
+      return allPeers;
     }
 
@@ -90 +92 @@
 
     private void SendHeartbeatToServer(object sender, ElapsedEventArgs e) {
-      try {
-        heartbeatClient.UpdateHeartbeat(myself);
+      lock (timerLock) {
+        try {
+          heartbeatClient.UpdateHeartbeat(myself);
+        }
+        catch { } //nothing to do
       }
-      catch { } //nothing to do
     }