Changeset 14196 for trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.9/SimSharp-3.0.9/Core/Resources/PreemptiveResource.cs

Timestamp:

07/23/16 08:58:27 (8 years ago)

Author:

abeham

Message:

#2644: upgraded Sim# version from 3.0.7 to 3.0.9

Location:

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.9

Files:

• . (moved) (moved from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7)
• SimSharp-3.0.9 (copied) (copied from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/SimSharp-3.0.7)
• SimSharp-3.0.9/Core/Resources/PreemptiveResource.cs (modified) (1 diff)

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.9/SimSharp-3.0.9/Core/Resources/PreemptiveResource.cs

@@ -89 +89 @@
 
     protected virtual void DoRelease(Release release) {
-      Users.Remove(release.Request);
+      if (!Users.Remove(release.Request)) {
+        var preemptRequest = release.Request as PreemptiveRequest;
+        if (preemptRequest != null) {
+          var current = RequestQueue[preemptRequest.Priority].First;
+          while (current != null && current.Value != release.Request)
+            current = current.Next;
+          if (current != null) RequestQueue[preemptRequest.Priority].Remove(current);
+        }
+      }
       release.Succeed();
     }