diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-09-16 16:06:00 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-09-16 16:06:00 -0300 |
| commit | 34d71197d52d8050a05d4cc715568409a06c888c (patch) | |
| tree | dd6b762e379224f6041efe466fc71d7e4eb71972 | |
| parent | 78f85cb38e4fd325892b56298bde299dd357061d (diff) | |
| parent | 7802b6cb5732b0329fdb58b3eef1f62bc89bf345 (diff) | |
| download | mullvadvpn-34d71197d52d8050a05d4cc715568409a06c888c.tar.xz mullvadvpn-34d71197d52d8050a05d4cc715568409a06c888c.zip | |
Merge branch 'fix-class-cast-crash'
| -rw-r--r-- | mullvad-jni/src/into_java.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs index bbaee67a8c..ab7470b840 100644 --- a/mullvad-jni/src/into_java.rs +++ b/mullvad-jni/src/into_java.rs @@ -133,7 +133,7 @@ fn ipvx_addr_into_java<'env>(original_octets: &[u8], env: &JNIEnv<'env>) -> JObj let octets = env.auto_local(JObject::from(octets_array)); let result = env .call_static_method_unchecked( - class.as_obj(), + &class, constructor, JavaType::Object("java/net/InetAddress".to_owned()), &[JValue::Object(octets.as_obj())], @@ -141,7 +141,7 @@ fn ipvx_addr_into_java<'env>(original_octets: &[u8], env: &JNIEnv<'env>) -> JObj .expect("Failed to create InetAddress Java object"); match result { - JValue::Object(object) => object, + JValue::Object(object) => JObject::from(object.into_inner()), value => { panic!( "InetAddress.getByAddress returned an invalid value: {:?}", |