Skip to content

Commit 8dc7ce4

Browse files
Address dead code and formatting issues in PR review
1 parent f061718 commit 8dc7ce4

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ public void MainLoopIteration()
767767
}
768768
}
769769

770-
public void NotifyHeartbeatListener()
770+
public void NotifyHeartbeatListener()
771771
{
772772
if (m_heartbeat != 0)
773773
{
@@ -1099,7 +1099,6 @@ public void HeartbeatWriteTimerCallback(object state)
10991099
if (!m_closed)
11001100
{
11011101
WriteFrame(m_heartbeatFrame);
1102-
//m_frameHandler.Flush();
11031102
}
11041103
}
11051104
catch (Exception e)

projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public abstract class ModelBase : IFullModel, IRecoverable
8787

8888
private EventHandler<EventArgs> m_recovery;
8989

90-
public IConsumerDispatcher ConsumerDispatcher { get; private set; }
90+
public IConsumerDispatcher ConsumerDispatcher { get; private set; }
9191

9292
public ModelBase(ISession session)
9393
: this(session, session.Connection.ConsumerWorkService)
@@ -104,7 +104,7 @@ public ModelBase(ISession session, ConsumerWorkService workService)
104104
{
105105
ConsumerDispatcher = new ConcurrentConsumerDispatcher(this, workService);
106106
}
107-
107+
108108
Initialise(session);
109109
}
110110

@@ -464,11 +464,8 @@ public void ModelSend(MethodBase method, ContentHeaderBase header, byte[] body)
464464
{
465465
if (method.HasContent)
466466
{
467-
//lock (m_flowSendLock)
468-
//{
469-
m_flowControlBlock.WaitOne();
470-
Session.Transmit(new Command(method, header, body));
471-
//}
467+
m_flowControlBlock.WaitOne();
468+
Session.Transmit(new Command(method, header, body));
472469
}
473470
else
474471
{
@@ -912,11 +909,8 @@ public void HandleChannelFlow(bool active)
912909
}
913910
else
914911
{
915-
//lock (m_flowSendLock)
916-
//{
917-
m_flowControlBlock.Reset();
918-
_Private_ChannelFlowOk(active);
919-
//}
912+
m_flowControlBlock.Reset();
913+
_Private_ChannelFlowOk(active);
920914
}
921915
OnFlowControl(new FlowControlEventArgs(active));
922916
}

0 commit comments

Comments
 (0)