X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FPayeePubKey.java;h=53ad74f3528fc3b50f4f5dffe857f367f48120e7;hb=ca313f2eee377bec222fa82b2939751fa9eab32e;hp=3f1ef3223a9e99cc6703536af232a8fc9792509a;hpb=f3e670e9341decac613d33fc52febf19cea32f20;p=ldk-java diff --git a/src/main/java/org/ldk/structs/PayeePubKey.java b/src/main/java/org/ldk/structs/PayeePubKey.java index 3f1ef322..53ad74f3 100644 --- a/src/main/java/org/ldk/structs/PayeePubKey.java +++ b/src/main/java/org/ldk/structs/PayeePubKey.java @@ -4,6 +4,7 @@ import org.ldk.impl.bindings; import org.ldk.enums.*; import org.ldk.util.*; import java.util.Arrays; +import java.lang.ref.Reference; import javax.annotation.Nullable; @@ -21,11 +22,14 @@ public class PayeePubKey extends CommonBase { public byte[] get_a() { byte[] ret = bindings.PayeePubKey_get_a(this.ptr); + Reference.reachabilityFence(this); return ret; } public void set_a(byte[] val) { bindings.PayeePubKey_set_a(this.ptr, InternalUtils.check_arr_len(val, 33)); + Reference.reachabilityFence(this); + Reference.reachabilityFence(val); } /** @@ -33,14 +37,16 @@ public class PayeePubKey extends CommonBase { */ public static PayeePubKey of(byte[] a_arg) { long ret = bindings.PayeePubKey_new(InternalUtils.check_arr_len(a_arg, 33)); + Reference.reachabilityFence(a_arg); if (ret >= 0 && ret <= 4096) { return null; } - PayeePubKey ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new PayeePubKey(null, ret); } - ret_hu_conv.ptrs_to.add(ret_hu_conv); + org.ldk.structs.PayeePubKey ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.PayeePubKey(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); }; return ret_hu_conv; } long clone_ptr() { long ret = bindings.PayeePubKey_clone_ptr(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -49,29 +55,40 @@ public class PayeePubKey extends CommonBase { */ public PayeePubKey clone() { long ret = bindings.PayeePubKey_clone(this.ptr); + Reference.reachabilityFence(this); if (ret >= 0 && ret <= 4096) { return null; } - PayeePubKey ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new PayeePubKey(null, ret); } - ret_hu_conv.ptrs_to.add(this); + org.ldk.structs.PayeePubKey ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.PayeePubKey(null, ret); } + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; } /** - * Checks if two PayeePubKeys contain equal inner contents. + * Generates a non-cryptographic 64-bit hash of the PayeePubKey. */ public long hash() { long ret = bindings.PayeePubKey_hash(this.ptr); + Reference.reachabilityFence(this); return ret; } + @Override public int hashCode() { + return (int)this.hash(); + } /** * Checks if two PayeePubKeys contain equal inner contents. * This ignores pointers and is_owned flags and looks at the values in fields. * Two objects with NULL inner values will be considered "equal" here. */ - public boolean eq(PayeePubKey b) { - boolean ret = bindings.PayeePubKey_eq(this.ptr, b == null ? 0 : b.ptr & ~1); - this.ptrs_to.add(b); + public boolean eq(org.ldk.structs.PayeePubKey b) { + boolean ret = bindings.PayeePubKey_eq(this.ptr, b == null ? 0 : b.ptr); + Reference.reachabilityFence(this); + Reference.reachabilityFence(b); + if (this != null) { this.ptrs_to.add(b); }; return ret; } + @Override public boolean equals(Object o) { + if (!(o instanceof PayeePubKey)) return false; + return this.eq((PayeePubKey)o); + } }