fix bug in includes

eclipse-zenoh · Jan 22, 2024 · a499d56 · a499d56
1 parent 1d109ad
commit a499d56
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/commons/zenoh-keyexpr/src/key_expr/include.rs b/commons/zenoh-keyexpr/src/key_expr/include.rs
@@ -38,7 +38,7 @@ impl Includer<&[u8], &[u8]> for LTRIncluder {
             let (lchunk, lrest) = left.split_once(&DELIMITER);
             let lempty = lrest.is_empty();
             if lchunk == DOUBLE_WILD {
-                if (lempty && !right.has_verbatim()) || self.includes(lrest, right) {
+                if (lempty && !right.has_verbatim()) || (!lempty && self.includes(lrest, right)) {
                     return true;
                 }
                 if unsafe { right.has_direct_verbatim_non_empty() } {

diff --git a/commons/zenoh-keyexpr/src/key_expr/tests.rs b/commons/zenoh-keyexpr/src/key_expr/tests.rs
@@ -104,6 +104,10 @@ fn intersections() {
     assert!(!intersect("@a/**", "@a/@b"));
     assert!(intersect("@a/**/@b", "@a/@b"));
     assert!(intersect("@a/@b/**", "@a/@b"));
+    assert!(intersect("@a/**/@c/**/@b", "@a/**/@c/@b"));
+    assert!(intersect("@a/**/@c/**/@b", "@a/@c/**/@b"));
+    assert!(intersect("@a/**/@c/@b", "@a/@c/**/@b"));
+    assert!(!intersect("@a/**/@b", "@a/**/@c/**/@b"));
 }
 
 fn includes<