Skip to content

Commit 1f9d148

Browse files
committed
PR review by @danielmarbach
1 parent b8bfc0d commit 1f9d148

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

projects/RabbitMQ.Client/client/impl/Connection.Receive.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private async Task ReceiveLoop()
8686

8787
private void ProcessFrame(InboundFrame frame)
8888
{
89-
bool shallReturn = true;
89+
bool shallReturnPayload = true;
9090
if (frame.Channel == 0)
9191
{
9292
if (frame.Type == FrameType.FrameHeartbeat)
@@ -105,7 +105,7 @@ private void ProcessFrame(InboundFrame frame)
105105
// quiescing situation, even though technically we
106106
// should be ignoring everything except
107107
// connection.close-ok.
108-
shallReturn = _session0.HandleFrame(in frame);
108+
shallReturnPayload = _session0.HandleFrame(in frame);
109109
}
110110
}
111111
else
@@ -121,11 +121,12 @@ private void ProcessFrame(InboundFrame frame)
121121
// connection. Handle the frame. (Of course, the
122122
// Session itself may be quiescing this particular
123123
// channel, but that's none of our concern.)
124-
shallReturn = _sessionManager.Lookup(frame.Channel).HandleFrame(in frame);
124+
ISession session = _sessionManager.Lookup(frame.Channel);
125+
shallReturnPayload = session.HandleFrame(in frame);
125126
}
126127
}
127128

128-
if (shallReturn)
129+
if (shallReturnPayload)
129130
{
130131
frame.ReturnPayload();
131132
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public bool TryReadFrame(out InboundFrame frame)
250250

251251
public void SendHeader()
252252
{
253-
#if NET6_0_OR_GREATER
253+
#if NET
254254
_pipeWriter.AsStream().Write(ProtocolHeader);
255255
#else
256256
_pipeWriter.AsStream().Write(ProtocolHeader.ToArray(), 0, ProtocolHeader.Length);

0 commit comments

Comments
 (0)