Merge pull request #117 from TheBlueMatt/2022-08-fix-npe

[ldk-java] / src / main / java / org / ldk / structs / TwoTuple_BlockHashChannelMonitorZ.java

diff --git a/src/main/java/org/ldk/structs/TwoTuple_BlockHashChannelMonitorZ.java b/src/main/java/org/ldk/structs/TwoTuple_BlockHashChannelMonitorZ.java
index 4a322a3b4074de34b222225ae50f3c06762864cd..20f35494108f8ecdb7042b85243fd3cb38ec8970 100644 (file)
--- a/src/main/java/org/ldk/structs/TwoTuple_BlockHashChannelMonitorZ.java
+++ b/src/main/java/org/ldk/structs/TwoTuple_BlockHashChannelMonitorZ.java
@@ -37,7 +37,7 @@ public class TwoTuple_BlockHashChannelMonitorZ extends CommonBase {
                Reference.reachabilityFence(this);
                if (ret >= 0 && ret <= 4096) { return null; }
                org.ldk.structs.ChannelMonitor ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelMonitor(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;
        }
 
@@ -56,7 +56,7 @@ public class TwoTuple_BlockHashChannelMonitorZ extends CommonBase {
                Reference.reachabilityFence(this);
                if (ret >= 0 && ret <= 4096) { return null; }
                TwoTuple_BlockHashChannelMonitorZ ret_hu_conv = new TwoTuple_BlockHashChannelMonitorZ(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;
        }
 
@@ -64,12 +64,13 @@ public class TwoTuple_BlockHashChannelMonitorZ extends CommonBase {
         * Creates a new C2Tuple_BlockHashChannelMonitorZ from the contained elements.
         */
        public static TwoTuple_BlockHashChannelMonitorZ of(byte[] a, ChannelMonitor b) {
-               long ret = bindings.C2Tuple_BlockHashChannelMonitorZ_new(InternalUtils.check_arr_len(a, 32), b == null ? 0 : b.ptr & ~1);
+               long ret = bindings.C2Tuple_BlockHashChannelMonitorZ_new(InternalUtils.check_arr_len(a, 32), b == null ? 0 : b.ptr);
                Reference.reachabilityFence(a);
                Reference.reachabilityFence(b);
                if (ret >= 0 && ret <= 4096) { return null; }
                TwoTuple_BlockHashChannelMonitorZ ret_hu_conv = new TwoTuple_BlockHashChannelMonitorZ(null, ret);
-               ret_hu_conv.ptrs_to.add(ret_hu_conv);
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(b); };
                return ret_hu_conv;
        }