Skip to content

Commit 4438af4

Browse files
committed
Merge branch 'UshakovMV_NewFixes' into origin/master
2 parents 3a7d261 + 5df964b commit 4438af4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

TinyTcpServer/MossbauerLab.TinyTcpServer.Core.FunctionalTests/Server/TestTcpServer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public void TestServerExchangeWithSeveralClients(Int32 numberOfClients, Int32 da
151151
}
152152
foreach (Task clientTask in clientTasks)
153153
clientTask.Start();
154-
Task.WaitAll(clientTasks.ToArray(), 120000);
154+
Task.WaitAll(clientTasks.ToArray(), 180000);
155155
foreach (Task clientTask in clientTasks)
156156
clientTask.Dispose();
157157
_server.Stop(true);

TinyTcpServer/MossbauerLab.TinyTcpServer.Core.FunctionalTests/TestUtils/NetworkClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ private Boolean ReadAsync(Byte[] data, out Int32 bytesRead)
192192
Int32 size = _clientSocket.Available;
193193
_clientSocket.BeginReceive(data, offset, size, SocketFlags.Partial, ReadAsyncCallback, _clientSocket);
194194
_readCompleted.Wait(_readTimeout);
195-
if (_bytesRead == data.Length)
195+
if (_bytesRead == data.Length || (_bytesRead > 0 && data.Length < 3 * _clientSocket.ReceiveBufferSize / 4))
196196
break;
197197
if (attempt > 0 && _bytesRead > offset)
198198
attempt--;

0 commit comments

Comments
 (0)