X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FType.java;h=d4a5cacfc5a47489d14528d496a3befd34de218e;hb=7b75443b8305c6a24d3c08520e1785e9d39960e4;hp=1bfb88d122267ea76140833284ac8ed7898739b8;hpb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;p=ldk-java diff --git a/src/main/java/org/ldk/structs/Type.java b/src/main/java/org/ldk/structs/Type.java index 1bfb88d1..d4a5cacf 100644 --- a/src/main/java/org/ldk/structs/Type.java +++ b/src/main/java/org/ldk/structs/Type.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; /** @@ -24,7 +25,19 @@ public class Type extends CommonBase { protected void finalize() throws Throwable { if (ptr != 0) { bindings.Type_free(ptr); } super.finalize(); } - + /** + * Destroys the object, freeing associated resources. After this call, any access + * to this object may result in a SEGFAULT or worse. + * + * You should generally NEVER call this method. You should let the garbage collector + * do this for you when it finalizes objects. However, it may be useful for types + * which represent locks and should be closed immediately to avoid holding locks + * until the GC runs. + */ + public void destroy() { + if (ptr != 0) { bindings.Type_free(ptr); } + ptr = 0; + } public static interface TypeInterface { /** * Returns the type identifying the message payload. @@ -45,14 +58,17 @@ public class Type extends CommonBase { impl_holder.held = new Type(new bindings.LDKType() { @Override public short type_id() { short ret = arg.type_id(); + Reference.reachabilityFence(arg); return ret; } @Override public String debug_str() { String ret = arg.debug_str(); + Reference.reachabilityFence(arg); return ret; } @Override public byte[] write() { byte[] ret = arg.write(); + Reference.reachabilityFence(arg); return ret; } }); @@ -63,6 +79,7 @@ public class Type extends CommonBase { */ public short type_id() { short ret = bindings.Type_type_id(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -71,6 +88,7 @@ public class Type extends CommonBase { */ public String debug_str() { String ret = bindings.Type_debug_str(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -79,6 +97,13 @@ public class Type extends CommonBase { */ public byte[] write() { byte[] ret = bindings.Type_write(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + + long clone_ptr() { + long ret = bindings.Type_clone_ptr(this.ptr); + Reference.reachabilityFence(this); return ret; } @@ -87,9 +112,10 @@ public class Type extends CommonBase { */ public Type clone() { long ret = bindings.Type_clone(this.ptr); + Reference.reachabilityFence(this); if (ret >= 0 && ret <= 4096) { return null; } Type ret_hu_conv = new Type(null, ret); - ret_hu_conv.ptrs_to.add(this); + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }; return ret_hu_conv; }