Skip to content

Commit

Permalink
Merge changes
Browse files Browse the repository at this point in the history
  • Loading branch information
javier-alvarez committed Apr 21, 2015
2 parents d225155 + 3a8a88b commit aef2c70
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions OrleansGrains/HttpGrain.fs
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ type HttpGrain() =
if (counter % 10 = 0) then raise (System.Exception("Multiple of 10!"))
task {

let ts1 = TaskScheduler.Current; // Grabs the Orleans task scheduler
assert ts1.GetType().Namespace.StartsWith("Orleans")
let! _ = Task.Delay(2000) |> Ignore
let ts1 = TaskScheduler.Current; // Grab the current TPL task scheduler
assert ts1.GetType().Namespace.StartsWith("Orleans") // Check that it is indeed an Orleans scheduler
let! _ = Task.Delay(100) |> Ignore

// check the scheduler
let ts2 = TaskScheduler.Current; // Grabs the Orleans task scheduler
assert ts2.GetType().Namespace.StartsWith("Orleans")
let ts2 = TaskScheduler.Current; // Grab the current TPL task scheduler
assert ts2.GetType().Namespace.StartsWith("Orleans") // Check that it is indeed still an Orleans scheduler

assert (ts1=ts2)

Expand Down

0 comments on commit aef2c70

Please sign in to comment.