Skip to content

Commit e02e6e5

Browse files
author
Emile Joubert
committed
Use original "cluster-id" instead of "reserved", even in 0.9.1
1 parent babd1d5 commit e02e6e5

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
329329
<field name="type" domain="shortstr"/>
330330
<field name="user-id" domain="shortstr"/>
331331
<field name="app-id" domain="shortstr"/>
332-
<field name="reserved" domain="shortstr"/>
332+
<field name="cluster-id" domain="shortstr"/>
333333
<method name="qos" synchronous="1" index="10">
334334
<chassis name="server" implement="MUST"/>
335335
<response name="qos-ok"/>

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
//---------------------------------------------------------------------------
5757
using System;
5858
using System.Collections;
59+
using RabbitMQ.Client.Apigen.Attributes;
5960

6061
namespace RabbitMQ.Client.Impl
6162
{
@@ -74,8 +75,7 @@ public abstract class BasicProperties: ContentHeaderBase, IBasicProperties
7475
public abstract string Type { get; set; }
7576
public abstract string UserId { get; set; }
7677
public abstract string AppId { get; set; }
77-
public virtual string ClusterId { get; set; }
78-
public virtual string Reserved { get; set; }
78+
public abstract string ClusterId { get; set; }
7979

8080
public abstract void ClearContentType();
8181
public abstract void ClearContentEncoding();
@@ -90,8 +90,7 @@ public abstract class BasicProperties: ContentHeaderBase, IBasicProperties
9090
public abstract void ClearType();
9191
public abstract void ClearUserId();
9292
public abstract void ClearAppId();
93-
public virtual void ClearClusterId() { }
94-
public virtual void ClearReserved() { }
93+
public abstract void ClearClusterId();
9594

9695
public abstract bool IsContentTypePresent();
9796
public abstract bool IsContentEncodingPresent();
@@ -106,8 +105,7 @@ public virtual void ClearReserved() { }
106105
public abstract bool IsTypePresent();
107106
public abstract bool IsUserIdPresent();
108107
public abstract bool IsAppIdPresent();
109-
public virtual bool IsClusterIdPresent() { return false; }
110-
public virtual bool IsReservedPresent() { return false; }
108+
public abstract bool IsClusterIdPresent();
111109

112110
public PublicationAddress ReplyToAddress
113111
{

0 commit comments

Comments
 (0)