feature(user attachment): refactor JNIQuery

eclipse-zenoh · Feb 19, 2024 · f48bd92 · f48bd92
1 parent 3c696a1
commit f48bd92
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/zenoh-jni/src/query.rs b/zenoh-jni/src/query.rs
@@ -51,7 +51,7 @@ use crate::{
 /// - `sample_kind`: The kind of sample.
 /// - `timestamp_enabled`: A boolean indicating whether the timestamp is enabled.
 /// - `timestamp_ntp_64`: The NTP64 timestamp value.
-/// - `attachment`: The user attachment bytes.
+/// - `attachment`: Optional user attachment encoded as a byte array. May be null.
 ///
 /// Safety:
 /// - This function is marked as unsafe due to raw pointer manipulation and JNI interaction.

diff --git a/zenoh-kotlin/src/commonMain/kotlin/io/zenoh/jni/JNIQuery.kt b/zenoh-kotlin/src/commonMain/kotlin/io/zenoh/jni/JNIQuery.kt
@@ -36,7 +36,7 @@ internal class JNIQuery(private val ptr: Long) {
             sample.kind.ordinal,
             timestampEnabled,
             if (timestampEnabled) sample.timestamp!!.ntpValue() else 0,
-            sample.attachment?.let { encodeAttachment(it) } ?: run { byteArrayOf() },
+            sample.attachment?.let { encodeAttachment(it) },
         )
     }
 
@@ -57,7 +57,7 @@ internal class JNIQuery(private val ptr: Long) {
         sampleKind: Int,
         timestampEnabled: Boolean,
         timestampNtp64: Long,
-        attachment: ByteArray,
+        attachment: ByteArray?,
     )
 
     @Throws(Exception::class)