Use AutoCloseable for structs named Locked*
[ldk-java] / src / main / java / org / ldk / structs / FundingLocked.java
index b330b6505f9ce9deb7c897b313ed697e87d84dfe..6b8f5b99dcae99c08eac7f272eabbcb531a93a91 100644 (file)
@@ -7,33 +7,34 @@ public class FundingLocked extends CommonBase {
        FundingLocked(Object _dummy, long ptr) { super(ptr); }
        @Override @SuppressWarnings("deprecation")
        protected void finalize() throws Throwable {
-               bindings.FundingLocked_free(ptr); super.finalize();
+               super.finalize();
+               bindings.FundingLocked_free(ptr);
        }
 
        public FundingLocked(FundingLocked orig) {
-               super(bindings.FundingLocked_clone(orig.ptr & ~1));
+               super(bindings.FundingLocked_clone(orig == null ? 0 : orig.ptr & ~1));
                this.ptrs_to.add(orig);
        }
 
        public byte[] get_channel_id(FundingLocked this_ptr) {
-               byte[] ret = bindings.FundingLocked_get_channel_id(this_ptr.ptr & ~1);
+               byte[] ret = bindings.FundingLocked_get_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1);
                this.ptrs_to.add(this_ptr);
                return ret;
        }
 
        public void set_channel_id(FundingLocked this_ptr, byte[] val) {
-               bindings.FundingLocked_set_channel_id(this_ptr.ptr & ~1, val);
+               bindings.FundingLocked_set_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
                this.ptrs_to.add(this_ptr);
        }
 
        public byte[] get_next_per_commitment_point(FundingLocked this_ptr) {
-               byte[] ret = bindings.FundingLocked_get_next_per_commitment_point(this_ptr.ptr & ~1);
+               byte[] ret = bindings.FundingLocked_get_next_per_commitment_point(this_ptr == null ? 0 : this_ptr.ptr & ~1);
                this.ptrs_to.add(this_ptr);
                return ret;
        }
 
        public void set_next_per_commitment_point(FundingLocked this_ptr, byte[] val) {
-               bindings.FundingLocked_set_next_per_commitment_point(this_ptr.ptr & ~1, val);
+               bindings.FundingLocked_set_next_per_commitment_point(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
                this.ptrs_to.add(this_ptr);
        }