Fix receiver delivery queue handling (#48)

Author: fafhrd91

CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [2.1.5] - 2024-04-17
+
+* Fix receiver's delivery queue handling
+
 ## [2.1.4] - 2024-04-13
 
 * Fix large transfers handling

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-amqp"
-version = "2.1.4"
+version = "2.1.5"
 authors = ["ntex contributors <[email protected]>"]
 description = "AMQP 1.0 Client/Server framework"
 documentation = "https://docs.rs/ntex-amqp"

src/rcvlink.rs

@@ -105,12 +105,22 @@ impl ReceiverLink {
 
     /// Check deliveries
     pub fn has_deliveries(&self) -> bool {
-        !self.inner.get_mut().queue.is_empty()
+        let inner = self.inner.get_ref();
+        if inner.partial_body.is_none() {
+            !inner.queue.is_empty()
+        } else {
+            inner.queue.len() > 1
+        }
     }
 
     /// Get delivery
     pub fn get_delivery(&self) -> Option<(Delivery, Transfer)> {
-        self.inner.get_mut().queue.pop_front()
+        let inner = self.inner.get_mut();
+        if inner.partial_body.is_none() || inner.queue.len() > 1 {
+            inner.queue.pop_front()
+        } else {
+            None
+        }
     }
 
     /// Send disposition frame
@@ -295,8 +305,6 @@ impl ReceiverLinkInner {
                 self.credit -= 1;
             }
 
-            println!("============= {:#?}\n{:?}", transfer, self.partial_body);
-
             // handle batched transfer
             if let Some(ref mut body) = self.partial_body {
                 if transfer.0.delivery_id.is_some() {