Handle unknown links

ntex-rs · Dec 3, 2024 · 3c27991 · 3c27991
1 parent 2f3f1aa
commit 3c27991
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [3.2.1] - 2024-12-03
+
+* Handle unknown links
+
 ## [3.2.0] - 2024-12-03
 
 * Fix control queue handling

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex-amqp"
-version = "3.2.0"
+version = "3.2.1"
 authors = ["ntex contributors <[email protected]>"]
 description = "AMQP 1.0 Client/Server framework"
 documentation = "https://docs.rs/ntex-amqp"

diff --git a/src/session.rs b/src/session.rs
@@ -582,7 +582,9 @@ impl SessionInner {
         }));
         self.post_frame(detach.into());
 
-        self.links.remove(token);
+        if self.links.contains(token) {
+            self.links.remove(token);
+        }
     }
 
     pub(crate) fn get_sender_link_by_local_handle(&self, hnd: Handle) -> Option<&SenderLink> {
@@ -723,7 +725,9 @@ impl SessionInner {
                     }));
                     self.post_frame(detach.into());
                     let _ = tx.send(Ok(()));
-                    let _ = self.links.remove(id as usize);
+                    if self.links.contains(id as usize) {
+                        let _ = self.links.remove(id as usize);
+                    }
                 }
                 ReceiverLinkState::Established(receiver_link) => {
                     let receiver_link = receiver_link.clone();
@@ -742,7 +746,9 @@ impl SessionInner {
                 }
                 ReceiverLinkState::Closing(_) => {
                     let _ = tx.send(Ok(()));
-                    let _ = self.links.remove(id as usize);
+                    if self.links.contains(id as usize) {
+                        let _ = self.links.remove(id as usize);
+                    }
                     log::error!(
                         "{}: Unexpected receiver link state: closing - {}",
                         self.tag(),
@@ -1089,7 +1095,9 @@ impl SessionInner {
         };
 
         if remove {
-            self.links.remove(idx);
+            if self.links.contains(idx) {
+                self.links.remove(idx);
+            }
             self.remote_handles.remove(&handle);
         }
         action