Skip to content

Commit ff35ae9

Browse files
author
Hubert Plociniczak
committed
Removed TICKET variable since generated code
can handle it automatically (sets 0).
1 parent a23ed08 commit ff35ae9

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

src/client/api/IModel.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,7 @@ public interface IFullModel : RabbitMQ.Client.IModel
449449
///public publish method after potential null-reference issues
450450
///have been rectified.</summary>
451451
[AmqpMethodMapping(null, "basic", "publish")]
452-
void _Private_BasicPublish(ushort ticket,
453-
string exchange,
452+
void _Private_BasicPublish(string exchange,
454453
string routingKey,
455454
bool mandatory,
456455
bool immediate,
@@ -464,8 +463,7 @@ void _Private_BasicPublish(ushort ticket,
464463
///datastructures.</summary>
465464
[AmqpForceOneWay]
466465
[AmqpMethodMapping(null, "basic", "consume")]
467-
void _Private_BasicConsume(ushort ticket,
468-
string queue,
466+
void _Private_BasicConsume(string queue,
469467
string consumerTag,
470468
bool noLocal,
471469
bool noAck,
@@ -515,8 +513,7 @@ void _Private_ChannelClose(ushort replyCode,
515513
///required.</summary>
516514
[AmqpForceOneWay]
517515
[AmqpMethodMapping(null, "basic", "get")]
518-
void _Private_BasicGet(ushort ticket,
519-
string queue,
516+
void _Private_BasicGet(string queue,
520517
bool noAck);
521518

522519
///<summary>Handle incoming Basic.GetOk methods. Routes the

src/client/impl/ModelBase.cs

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ public abstract class ModelBase : IFullModel
7676
private readonly object m_eventLock = new object();
7777
private BasicReturnEventHandler m_basicReturn;
7878
private CallbackExceptionEventHandler m_callbackException;
79-
80-
///<summary>Deprecated. When 0.9.1 is signed off, tickets can be removed
81-
///from the codec and this field can be deleted.</summary>
82-
public ushort TICKET = 0;
8379

8480
public event ModelShutdownEventHandler ModelShutdown
8581
{
@@ -584,7 +580,7 @@ public string BasicConsume(string queue,
584580
// the RPC response, but a response is still expected.
585581
try
586582
{
587-
_Private_BasicConsume(TICKET, queue, consumerTag, noLocal, noAck, exclusive,
583+
_Private_BasicConsume(queue, consumerTag, noLocal, noAck, exclusive,
588584
/*nowait:*/ false, filter);
589585
}
590586
catch (AlreadyClosedException)
@@ -686,7 +682,7 @@ public BasicGetResult BasicGet(string queue,
686682
Enqueue(k);
687683
try
688684
{
689-
_Private_BasicGet(TICKET, queue, noAck);
685+
_Private_BasicGet(queue, noAck);
690686
}
691687
catch (AlreadyClosedException)
692688
{
@@ -702,8 +698,7 @@ public abstract void BasicQos(uint prefetchSize,
702698
ushort prefetchCount,
703699
bool global);
704700

705-
public abstract void _Private_BasicConsume(ushort ticket,
706-
string queue,
701+
public abstract void _Private_BasicConsume(string queue,
707702
string consumerTag,
708703
bool noLocal,
709704
bool noAck,
@@ -748,17 +743,15 @@ public void BasicPublish(string exchange,
748743
{
749744
basicProperties = CreateBasicProperties();
750745
}
751-
_Private_BasicPublish(TICKET,
752-
exchange,
746+
_Private_BasicPublish(exchange,
753747
routingKey,
754748
mandatory,
755749
immediate,
756750
basicProperties,
757751
body);
758752
}
759753

760-
public abstract void _Private_BasicPublish(ushort ticket,
761-
string exchange,
754+
public abstract void _Private_BasicPublish(string exchange,
762755
string routingKey,
763756
bool mandatory,
764757
bool immediate,
@@ -814,8 +807,7 @@ public abstract void _Private_ChannelClose(ushort replyCode,
814807

815808
public abstract void _Private_ChannelCloseOk();
816809

817-
public abstract void _Private_BasicGet(ushort ticket,
818-
string queue,
810+
public abstract void _Private_BasicGet(string queue,
819811
bool noAck);
820812

821813
public void HandleBasicGetOk(ulong deliveryTag,

0 commit comments

Comments
 (0)