Merge pull request #201 from Entroper/fix-stale-delivery-tag-stable

kjnilsson · web-flow · commit c586827ec000 · 2016-06-13T16:42:46.000+01:00
Fix stale delivery tags in RecoveryAwareModel
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/RecoveryAwareModel.cs b/projects/client/RabbitMQ.Client/src/client/impl/RecoveryAwareModel.cs
@@ -86,7 +86,7 @@ public override void BasicAck(ulong deliveryTag,
             bool multiple)
         {
             ulong realTag = deliveryTag - ActiveDeliveryTagOffset;
-            if (realTag > 0)
+            if (realTag > 0 && realTag <= deliveryTag)
             {
                 base.BasicAck(realTag, multiple);
             }
@@ -97,7 +97,7 @@ public override void BasicNack(ulong deliveryTag,
             bool requeue)
         {
             ulong realTag = deliveryTag - ActiveDeliveryTagOffset;
-            if (realTag > 0)
+            if (realTag > 0 && realTag <= deliveryTag)
             {
                 base.BasicNack(realTag, multiple, requeue);
             }
@@ -107,7 +107,7 @@ public override void BasicReject(ulong deliveryTag,
             bool requeue)
         {
             ulong realTag = deliveryTag - ActiveDeliveryTagOffset;
-            if (realTag > 0)
+            if (realTag > 0 && realTag <= deliveryTag)
             {
                 base.BasicReject(realTag, requeue);
             }

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public override void BasicAck(ulong deliveryTag,`
`86`	`86`	`bool multiple)`
`87`	`87`	`{`
`88`	`88`	`ulong realTag = deliveryTag - ActiveDeliveryTagOffset;`
`89`		`- if (realTag > 0)`
	`89`	`+ if (realTag > 0 && realTag <= deliveryTag)`
`90`	`90`	`{`
`91`	`91`	`base.BasicAck(realTag, multiple);`
`92`	`92`	`}`
`@@ -97,7 +97,7 @@ public override void BasicNack(ulong deliveryTag,`
`97`	`97`	`bool requeue)`
`98`	`98`	`{`
`99`	`99`	`ulong realTag = deliveryTag - ActiveDeliveryTagOffset;`
`100`		`- if (realTag > 0)`
	`100`	`+ if (realTag > 0 && realTag <= deliveryTag)`
`101`	`101`	`{`
`102`	`102`	`base.BasicNack(realTag, multiple, requeue);`
`103`	`103`	`}`
`@@ -107,7 +107,7 @@ public override void BasicReject(ulong deliveryTag,`
`107`	`107`	`bool requeue)`
`108`	`108`	`{`
`109`	`109`	`ulong realTag = deliveryTag - ActiveDeliveryTagOffset;`
`110`		`- if (realTag > 0)`
	`110`	`+ if (realTag > 0 && realTag <= deliveryTag)`
`111`	`111`	`{`
`112`	`112`	`base.BasicReject(realTag, requeue);`
`113`	`113`	`}`