Skip to content

Commit 2b85817

Browse files
Merge stable into master, references #82
2 parents d878ea4 + ca0c9ba commit 2b85817

File tree

8 files changed

+261
-154
lines changed

8 files changed

+261
-154
lines changed

projects/client/RabbitMQ.Client.WinRT/src/client/impl/SocketFrameHandler.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ public int Timeout
134134
{
135135
set
136136
{
137+
// Ignored, timeouts over streams on WinRT
138+
// are much trickier to get right.
139+
//
140+
// Heartbeat implementation is in Connection.
137141
}
138142
}
139143

@@ -191,6 +195,14 @@ public void WriteFrame(Frame frame)
191195
}
192196
}
193197

198+
public void Flush()
199+
{
200+
lock (m_writer)
201+
{
202+
m_writer.Flush();
203+
}
204+
}
205+
194206
private void Connect(StreamSocket socket, AmqpTcpEndpoint endpoint, int timeout)
195207
{
196208
IAsyncAction ar = null;

0 commit comments

Comments
 (0)