Skip to content

Commit

Permalink
fix merge leftover
Browse files Browse the repository at this point in the history
  • Loading branch information
bollhals committed Jan 29, 2021
1 parent 7e938b6 commit 9897874
Showing 1 changed file with 1 addition and 27 deletions.
28 changes: 1 addition & 27 deletions projects/RabbitMQ.Client/client/impl/AutorecoveringModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public void Close(ushort replyCode, string replyText, bool abort)
}
}

public override string ToString()
public override string ToString()
=> InnerChannel.ToString();

public void Dispose()
Expand Down Expand Up @@ -251,32 +251,6 @@ public void BasicRecoverAsync(bool requeue)
public void BasicReject(ulong deliveryTag, bool requeue)
=> InnerChannel.BasicReject(deliveryTag, requeue);

public void Close()
{
ThrowIfDisposed();
try
{
_innerChannel.Close();
}
finally
{
_connection.DeleteRecordedChannel(this);
}
}

public void Close(ushort replyCode, string replyText)
{
ThrowIfDisposed();
try
{
_innerChannel.Close(replyCode, replyText);
}
finally
{
_connection.DeleteRecordedChannel(this);
}
}

public void ConfirmSelect()
{
InnerChannel.ConfirmSelect();
Expand Down

0 comments on commit 9897874

Please sign in to comment.