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

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

diff --git a/src/main/java/org/ldk/structs/ExpiryTime.java b/src/main/java/org/ldk/structs/ExpiryTime.java
index 07601ecc74296944a0d52485b6eebe6cbdde2cc0..a187cb5073b930b357eac7e7ee9eecb4a5afeac2 100644 (file)
--- a/src/main/java/org/ldk/structs/ExpiryTime.java
+++ b/src/main/java/org/ldk/structs/ExpiryTime.java
@@ -34,8 +34,8 @@ public class ExpiryTime extends CommonBase {
                long ret = bindings.ExpiryTime_clone(this.ptr);
                Reference.reachabilityFence(this);
                if (ret >= 0 && ret <= 4096) { return null; }
-               ExpiryTime ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ExpiryTime(null, ret); }
-               ret_hu_conv.ptrs_to.add(this);
+               org.ldk.structs.ExpiryTime ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ExpiryTime(null, ret); }
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
                return ret_hu_conv;
        }
 
@@ -57,10 +57,10 @@ public class ExpiryTime extends CommonBase {
         * Two objects with NULL inner values will be considered "equal" here.
         */
        public boolean eq(ExpiryTime b) {
-               boolean ret = bindings.ExpiryTime_eq(this.ptr, b == null ? 0 : b.ptr & ~1);
+               boolean ret = bindings.ExpiryTime_eq(this.ptr, b == null ? 0 : b.ptr);
                Reference.reachabilityFence(this);
                Reference.reachabilityFence(b);
-               this.ptrs_to.add(b);
+               if (this != null) { this.ptrs_to.add(b); };
                return ret;
        }
 
@@ -75,8 +75,8 @@ public class ExpiryTime extends CommonBase {
                long ret = bindings.ExpiryTime_from_seconds(seconds);
                Reference.reachabilityFence(seconds);
                if (ret >= 0 && ret <= 4096) { return null; }
-               ExpiryTime ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ExpiryTime(null, ret); }
-               ret_hu_conv.ptrs_to.add(ret_hu_conv);
+               org.ldk.structs.ExpiryTime ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ExpiryTime(null, ret); }
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
                return ret_hu_conv;
        }
 
@@ -87,8 +87,8 @@ public class ExpiryTime extends CommonBase {
                long ret = bindings.ExpiryTime_from_duration(duration);
                Reference.reachabilityFence(duration);
                if (ret >= 0 && ret <= 4096) { return null; }
-               ExpiryTime ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ExpiryTime(null, ret); }
-               ret_hu_conv.ptrs_to.add(ret_hu_conv);
+               org.ldk.structs.ExpiryTime ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ExpiryTime(null, ret); }
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
                return ret_hu_conv;
        }