X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelManagerPersister.java;h=0e3cf3474199ac0e63d3cc293d93fc0d868273ee;hb=6fe917116a65d7b62123226c4240d77ea2719783;hp=abff5e62d1933129c4cb2276d9c6b45bf4a07528;hpb=db1a11032b4164540a2d3403696be12bbca70e94;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ChannelManagerPersister.java b/src/main/java/org/ldk/structs/ChannelManagerPersister.java index abff5e62..0e3cf347 100644 --- a/src/main/java/org/ldk/structs/ChannelManagerPersister.java +++ b/src/main/java/org/ldk/structs/ChannelManagerPersister.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; /** @@ -39,9 +40,10 @@ 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; + Reference.reachabilityFence(arg); + long result = ret == null ? 0 : ret.clone_ptr(); return result; } }); @@ -55,7 +57,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); - if (ret < 1024) { return null; } + 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;