X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelManagerPersister.java;h=686a076ebf77a0e55a4106be0624d06378cc3ad8;hb=1854b5cebef22ace9e9e4dd191f609818df9ce08;hp=1bbc3e30dbe507549d78109000d6298c1dc1fc70;hpb=b6cc0960eaee5a5bbc7fde79a56152d6dcd649d8;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ChannelManagerPersister.java b/src/main/java/org/ldk/structs/ChannelManagerPersister.java index 1bbc3e30..686a076e 100644 --- a/src/main/java/org/ldk/structs/ChannelManagerPersister.java +++ b/src/main/java/org/ldk/structs/ChannelManagerPersister.java @@ -4,6 +4,8 @@ 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; /** * Trait which handles persisting a [`ChannelManager`] to disk. @@ -38,9 +40,9 @@ public class ChannelManagerPersister extends CommonBase { final LDKChannelManagerPersisterHolder impl_holder = new LDKChannelManagerPersisterHolder(); impl_holder.held = new ChannelManagerPersister(new bindings.LDKChannelManagerPersister() { @Override public long persist_manager(long channel_manager) { - ChannelManager channel_manager_hu_conv = new ChannelManager(null, channel_manager); + ChannelManager channel_manager_hu_conv = null; if (channel_manager < 0 || channel_manager > 4096) { channel_manager_hu_conv = new ChannelManager(null, channel_manager); } Result_NoneErrorZ ret = arg.persist_manager(channel_manager_hu_conv); - long result = ret != null ? ret.ptr : 0; + long result = ret == null ? 0 : ret.clone_ptr(); return result; } }); @@ -54,6 +56,9 @@ public class ChannelManagerPersister extends CommonBase { */ public Result_NoneErrorZ persist_manager(ChannelManager channel_manager) { long ret = bindings.ChannelManagerPersister_persist_manager(this.ptr, channel_manager == null ? 0 : channel_manager.ptr & ~1); + Reference.reachabilityFence(this); + Reference.reachabilityFence(channel_manager); + if (ret >= 0 && ret <= 4096) { return null; } Result_NoneErrorZ ret_hu_conv = Result_NoneErrorZ.constr_from_ptr(ret); this.ptrs_to.add(channel_manager); return ret_hu_conv;