Don't register current interests declaration replies

eclipse-zenoh · Sep 6, 2024 · 98d4b8a · 98d4b8a
1 parent 93ecace
commit 98d4b8a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/zenoh/src/net/routing/hat/client/token.rs b/zenoh/src/net/routing/hat/client/token.rs
@@ -116,10 +116,6 @@ fn declare_simple_token(
     interest_id: Option<InterestId>,
     send_declare: &mut SendDeclare,
 ) {
-    register_simple_token(tables, face, id, res);
-
-    propagate_simple_token(tables, res, face, send_declare);
-
     if let Some(interest_id) = interest_id {
         if let Some((interest, _)) = face.pending_current_interests.get(&interest_id) {
             let wire_expr = Resource::get_best_key(res, "", interest.src_face.id);
@@ -137,6 +133,9 @@ fn declare_simple_token(
                 ),
             )
         }
+    } else {
+        register_simple_token(tables, face, id, res);
+        propagate_simple_token(tables, res, face, send_declare);
     }
 }
 

diff --git a/zenoh/src/net/routing/hat/p2p_peer/token.rs b/zenoh/src/net/routing/hat/p2p_peer/token.rs
@@ -155,10 +155,6 @@ fn declare_simple_token(
     interest_id: Option<InterestId>,
     send_declare: &mut SendDeclare,
 ) {
-    register_simple_token(tables, face, id, res);
-
-    propagate_simple_token(tables, res, face, send_declare);
-
     if let Some(interest_id) = interest_id {
         if let Some((interest, _)) = face.pending_current_interests.get(&interest_id) {
             let wire_expr = Resource::get_best_key(res, "", interest.src_face.id);
@@ -176,6 +172,9 @@ fn declare_simple_token(
                 ),
             )
         }
+    } else {
+        register_simple_token(tables, face, id, res);
+        propagate_simple_token(tables, res, face, send_declare);
     }
 }