X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FResult_LockedChannelMonitorNoneZ.java;h=bbf05394d1282694669b7ea348c4bbf97012d1b6;hb=3c60e0fd0da579be9932801c1be2b32014c944a5;hp=50d8b037ae42966760cec80f5ccf743c58c2b86f;hpb=1854b5cebef22ace9e9e4dd191f609818df9ce08;p=ldk-java diff --git a/src/main/java/org/ldk/structs/Result_LockedChannelMonitorNoneZ.java b/src/main/java/org/ldk/structs/Result_LockedChannelMonitorNoneZ.java index 50d8b037..bbf05394 100644 --- a/src/main/java/org/ldk/structs/Result_LockedChannelMonitorNoneZ.java +++ b/src/main/java/org/ldk/structs/Result_LockedChannelMonitorNoneZ.java @@ -24,9 +24,9 @@ public class Result_LockedChannelMonitorNoneZ extends CommonBase { public final LockedChannelMonitor res; private Result_LockedChannelMonitorNoneZ_OK(Object _dummy, long ptr) { super(_dummy, ptr); - long res = bindings.LDKCResult_LockedChannelMonitorNoneZ_get_ok(ptr); - LockedChannelMonitor res_hu_conv = null; if (res < 0 || res > 4096) { res_hu_conv = new LockedChannelMonitor(null, res); } - res_hu_conv.ptrs_to.add(this); + long res = bindings.CResult_LockedChannelMonitorNoneZ_get_ok(ptr); + org.ldk.structs.LockedChannelMonitor res_hu_conv = null; if (res < 0 || res > 4096) { res_hu_conv = new org.ldk.structs.LockedChannelMonitor(null, res); } + if (res_hu_conv != null) { res_hu_conv.ptrs_to.add(this); }; this.res = res_hu_conv; } } @@ -41,11 +41,11 @@ public class Result_LockedChannelMonitorNoneZ extends CommonBase { * Creates a new CResult_LockedChannelMonitorNoneZ in the success state. */ public static Result_LockedChannelMonitorNoneZ ok(LockedChannelMonitor o) { - long ret = bindings.CResult_LockedChannelMonitorNoneZ_ok(o == null ? 0 : o.ptr & ~1); + long ret = bindings.CResult_LockedChannelMonitorNoneZ_ok(o == null ? 0 : o.ptr); Reference.reachabilityFence(o); if (ret >= 0 && ret <= 4096) { return null; } Result_LockedChannelMonitorNoneZ ret_hu_conv = Result_LockedChannelMonitorNoneZ.constr_from_ptr(ret); - ret_hu_conv.ptrs_to.add(o); + if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(o); }; // Due to rust's strict-ownership memory model, in some cases we need to "move" // an object to pass exclusive ownership to the function being called. // In most cases, we avoid ret_hu_conv being visible in GC'd languages by cloning the object @@ -53,7 +53,7 @@ public class Result_LockedChannelMonitorNoneZ extends CommonBase { // However, in some cases (eg here), there is no way to clone an object, and thus // we actually have to pass full ownership to Rust. // Thus, after ret_hu_conv call, o is reset to null and is now a dummy object. - o.ptr = 0; + o.ptr = 0;; return ret_hu_conv; }