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

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

diff --git a/src/main/java/org/ldk/structs/InvoiceSignature.java b/src/main/java/org/ldk/structs/InvoiceSignature.java
index 8ff00fc63149835993d9c2c364abde30915740b6..63a4a581255e6818fc781ec64f62a29f0fe277f5 100644 (file)
--- a/src/main/java/org/ldk/structs/InvoiceSignature.java
+++ b/src/main/java/org/ldk/structs/InvoiceSignature.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;
 
 
@@ -19,14 +20,21 @@ public class InvoiceSignature extends CommonBase {
                if (ptr != 0) { bindings.InvoiceSignature_free(ptr); }
        }
 
+       long clone_ptr() {
+               long ret = bindings.InvoiceSignature_clone_ptr(this.ptr);
+               Reference.reachabilityFence(this);
+               return ret;
+       }
+
        /**
         * Creates a copy of the InvoiceSignature
         */
        public InvoiceSignature clone() {
                long ret = bindings.InvoiceSignature_clone(this.ptr);
+               Reference.reachabilityFence(this);
                if (ret >= 0 && ret <= 4096) { return null; }
-               InvoiceSignature ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new InvoiceSignature(null, ret); }
-               ret_hu_conv.ptrs_to.add(this);
+               org.ldk.structs.InvoiceSignature ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.InvoiceSignature(null, ret); }
+               if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
                return ret_hu_conv;
        }
 
@@ -36,9 +44,15 @@ public class InvoiceSignature extends CommonBase {
         * Two objects with NULL inner values will be considered "equal" here.
         */
        public boolean eq(InvoiceSignature b) {
-               boolean ret = bindings.InvoiceSignature_eq(this.ptr, b == null ? 0 : b.ptr & ~1);
-               this.ptrs_to.add(b);
+               boolean ret = bindings.InvoiceSignature_eq(this.ptr, b == null ? 0 : b.ptr);
+               Reference.reachabilityFence(this);
+               Reference.reachabilityFence(b);
+               if (this != null) { this.ptrs_to.add(b); };
                return ret;
        }
 
+       @Override public boolean equals(Object o) {
+               if (!(o instanceof InvoiceSignature)) return false;
+               return this.eq((InvoiceSignature)o);
+       }
 }