Skip to content

Commit

Permalink
Merge branch 'dev' into restartflow
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaronontheweb committed Sep 21, 2017
2 parents 1ba54bf + 6aa282c commit 2a24bde
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/core/Akka/IO/Tcp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,8 @@ private static void OnComplete(object sender, SocketAsyncEventArgs e)
actorRef?.Tell(ResolveMessage(e));
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
// Disabled pending resolution: https://github.com/akkadotnet/akka.net/issues/3092
// [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static Tcp.SocketCompleted ResolveMessage(SocketAsyncEventArgs e)
{
switch (e.LastOperation)
Expand Down Expand Up @@ -1315,4 +1316,4 @@ public static IActorRef Tcp(this ActorSystem system)
return IO.Tcp.Manager(system);
}
}
}
}

0 comments on commit 2a24bde

Please sign in to comment.