From 40022528b61d8b2c008c4d2f77ac5e9533d131c6 Mon Sep 17 00:00:00 2001 From: Steve Hockema Date: Sun, 30 Jun 2024 00:40:53 -0400 Subject: [PATCH 1/2] fix incorrect JNI signature for PatchAction.FlagConflict constructor --- rust/src/patches.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/src/patches.rs b/rust/src/patches.rs index 0e4e98b..1bac87e 100644 --- a/rust/src/patches.rs +++ b/rust/src/patches.rs @@ -123,7 +123,7 @@ fn to_jni_patch<'a>( let jprop = prop_to_java(env, &prop)?; env.new_object( FLAG_CONFLICT_CLASS, - format!("(L{};J)V", PROP_CLASS), + format!("(L{};)V", PROP_CLASS), &[jprop.into(), 0.into()], )? } From 845367754b9c3d366769dfea59cc71c9c361f0b1 Mon Sep 17 00:00:00 2001 From: Steve Hockema Date: Sun, 30 Jun 2024 01:01:28 -0400 Subject: [PATCH 2/2] also remove the 2nd parameter from the constructor call --- rust/src/patches.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/src/patches.rs b/rust/src/patches.rs index 1bac87e..d9900aa 100644 --- a/rust/src/patches.rs +++ b/rust/src/patches.rs @@ -124,7 +124,7 @@ fn to_jni_patch<'a>( env.new_object( FLAG_CONFLICT_CLASS, format!("(L{};)V", PROP_CLASS), - &[jprop.into(), 0.into()], + &[jprop.into()], )? } };