Skip to content

Commit 587b7a0

Browse files
raderade
committed
merge bug23593 into default
2 parents 572f9f7 + 4f1cceb commit 587b7a0

File tree

8 files changed

+14
-122
lines changed

8 files changed

+14
-122
lines changed

‎docs/specs/amqp0-8.stripped.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -684,19 +684,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
684684
<chassis name="client" implement="MUST"/>
685685
</method>
686686
</class>
687-
<class name="confirm" handler="channel" index="85">
688-
<method name="select" synchronous="1" index="10">
689-
<chassis name="server" implement="MUST"/>
690-
<response name="select-ok"/>
691-
<field name = "multiple" type = "bit">
692-
</field>
693-
<field name = "nowait" type = "bit">
694-
</field>
695-
</method>
696-
<method name="select-ok" synchronous="1" index="11">
697-
<chassis name="client" implement="MUST"/>
698-
</method>
699-
</class>
700687
<class name="tunnel" handler="tunnel" index="110">
701688
<chassis name="server" implement="MAY"/>
702689
<chassis name="client" implement="MAY"/>

‎docs/specs/amqp0-8.xml

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3684,43 +3684,6 @@ confirm transaction mode
36843684
<chassis name="client" implement="MUST"/>
36853685
</method>
36863686
</class>
3687-
<class name="confirm" handler="channel" index="85">
3688-
<method name="select" synchronous="1" index="10">
3689-
select confirm mode (i.e. enable publisher acknowledgements)
3690-
<doc>
3691-
This method sets the channel to use publisher acknowledgements.
3692-
The client can only use this method on a non-transactional
3693-
channel.
3694-
</doc>
3695-
<chassis name="server" implement="MUST"/>
3696-
<response name="select-ok"/>
3697-
<field name = "multiple" type = "bit">
3698-
acknowledge multiple messages
3699-
<doc>
3700-
If set to 1, the delivery tag in the returned acks is
3701-
treated as "up to and including", so that the server can
3702-
acknowledge multiple messages with a single method. If set
3703-
to zero, the delivery tag refers to a single message.
3704-
</doc>
3705-
</field>
3706-
<field name = "nowait" type = "bit">
3707-
do not send a reply method
3708-
<doc>
3709-
If set, the server will not respond to the method. The client should
3710-
not wait for a reply method. If the server could not complete the
3711-
method it will raise a channel or connection exception.
3712-
</doc>
3713-
</field>
3714-
</method>
3715-
<method name="select-ok" synchronous="1" index="11">
3716-
acknowledge confirm mode
3717-
<doc>
3718-
This method confirms to the client that the channel was successfully
3719-
set to use publisher acknowledgements.
3720-
</doc>
3721-
<chassis name="client" implement="MUST"/>
3722-
</method>
3723-
</class>
37243687
<class name="tunnel" handler="tunnel" index="110">
37253688
<!--
37263689
======================================================

‎docs/specs/amqp0-9-1.stripped.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,8 +488,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
488488
<method name="select" synchronous="1" index="10">
489489
<chassis name="server" implement="MUST"/>
490490
<response name="select-ok"/>
491-
<field name = "multiple" type = "bit">
492-
</field>
493491
<field name = "nowait" type = "bit">
494492
</field>
495493
</method>

‎docs/specs/amqp0-9-1.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2859,15 +2859,6 @@
28592859
</doc>
28602860
<chassis name="server" implement="MUST"/>
28612861
<response name="select-ok"/>
2862-
<field name = "multiple" type = "bit">
2863-
acknowledge multiple messages
2864-
<doc>
2865-
If set to 1, the delivery tag in the returned acks is
2866-
treated as "up to and including", so that the server can
2867-
acknowledge multiple messages with a single method. If set
2868-
to zero, the delivery tag refers to a single message.
2869-
</doc>
2870-
</field>
28712862
<field name = "nowait" type = "bit">
28722863
do not send a reply method
28732864
<doc>

‎docs/specs/amqp0-9.stripped.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -716,19 +716,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
716716
<chassis name="client" implement="MUST"/>
717717
</method>
718718
</class>
719-
<class name="confirm" handler="channel" index="85">
720-
<method name="select" synchronous="1" index="10">
721-
<chassis name="server" implement="MUST"/>
722-
<response name="select-ok"/>
723-
<field name = "multiple" type = "bit">
724-
</field>
725-
<field name = "nowait" type = "bit">
726-
</field>
727-
</method>
728-
<method name="select-ok" synchronous="1" index="11">
729-
<chassis name="client" implement="MUST"/>
730-
</method>
731-
</class>
732719
<class name="tunnel" handler="tunnel" index="110">
733720
<chassis name="server" implement="MAY"/>
734721
<chassis name="client" implement="MAY"/>

‎docs/specs/amqp0-9.xml

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4384,44 +4384,6 @@
43844384
</method>
43854385
</class>
43864386

4387-
<class name="confirm" handler="channel" index="85">
4388-
<method name="select" synchronous="1" index="10">
4389-
select confirm mode (i.e. enable publisher acknowledgements)
4390-
<doc>
4391-
This method sets the channel to use publisher acknowledgements.
4392-
The client can only use this method on a non-transactional
4393-
channel.
4394-
</doc>
4395-
<chassis name="server" implement="MUST"/>
4396-
<response name="select-ok"/>
4397-
<field name = "multiple" type = "bit">
4398-
acknowledge multiple messages
4399-
<doc>
4400-
If set to 1, the delivery tag in the returned acks is
4401-
treated as "up to and including", so that the server can
4402-
acknowledge multiple messages with a single method. If set
4403-
to zero, the delivery tag refers to a single message.
4404-
</doc>
4405-
</field>
4406-
<field name = "nowait" type = "bit">
4407-
do not send a reply method
4408-
<doc>
4409-
If set, the server will not respond to the method. The client should
4410-
not wait for a reply method. If the server could not complete the
4411-
method it will raise a channel or connection exception.
4412-
</doc>
4413-
</field>
4414-
</method>
4415-
<method name="select-ok" synchronous="1" index="11">
4416-
acknowledge confirm mode
4417-
<doc>
4418-
This method confirms to the client that the channel was successfully
4419-
set to use publisher acknowledgements.
4420-
</doc>
4421-
<chassis name="client" implement="MUST"/>
4422-
</method>
4423-
</class>
4424-
44254387
<!-- == TUNNEL =========================================================== -->
44264388

44274389
<class name = "tunnel" handler = "tunnel" index = "110" label = "methods for protocol tunnelling">

‎projects/client/RabbitMQ.Client/src/client/api/IModel.cs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,12 +317,16 @@ uint QueueDelete(string queue,
317317
///<summary>Enable publisher acknowledgements.</summary>
318318
[AmqpMethodDoNotImplement(null)]
319319
[AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid")]
320-
void ConfirmSelect(bool multiple);
320+
[AmqpUnsupported("RabbitMQ.Client.Framing.v0_8")]
321+
[AmqpUnsupported("RabbitMQ.Client.Framing.v0_9")]
322+
void ConfirmSelect();
321323

322324
///<summary>Enable publisher acknowledgements.</summary>
323325
[AmqpMethodDoNotImplement(null)]
324326
[AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid")]
325-
void ConfirmSelect(bool multiple, bool nowait);
327+
[AmqpUnsupported("RabbitMQ.Client.Framing.v0_8")]
328+
[AmqpUnsupported("RabbitMQ.Client.Framing.v0_9")]
329+
void ConfirmSelect(bool nowait);
326330

327331

328332
///<summary>Start a Basic content-class consumer.</summary>
@@ -615,9 +619,10 @@ void _Private_BasicConsume(string queue,
615619
///confirm API calls this while also managing internal
616620
///datastructures.</summary>
617621
[AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid")]
622+
[AmqpUnsupported("RabbitMQ.Client.Framing.v0_8")]
623+
[AmqpUnsupported("RabbitMQ.Client.Framing.v0_9")]
618624
[AmqpMethodMapping(null, "confirm", "select")]
619-
void _Private_ConfirmSelect(bool multiple,
620-
[AmqpNowaitArgument(null)]
625+
void _Private_ConfirmSelect([AmqpNowaitArgument(null)]
621626
bool nowait);
622627

623628

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -748,18 +748,17 @@ public abstract uint QueueDelete(string queue,
748748
bool ifEmpty,
749749
bool nowait);
750750

751-
public void ConfirmSelect(bool multiple) {
752-
ConfirmSelect(multiple, false);
751+
public void ConfirmSelect() {
752+
ConfirmSelect(false);
753753
}
754754

755-
public void ConfirmSelect(bool multiple, bool nowait) {
755+
public void ConfirmSelect(bool nowait) {
756756
m_pubMsgCount = 0;
757-
_Private_ConfirmSelect(multiple, nowait);
757+
_Private_ConfirmSelect(nowait);
758758
}
759759

760760

761-
public abstract void _Private_ConfirmSelect(bool multiple,
762-
bool nowait);
761+
public abstract void _Private_ConfirmSelect(bool nowait);
763762

764763
public string BasicConsume(string queue,
765764
IDictionary arguments,

0 commit comments

Comments
 (0)