Use AutoCloseable for structs named Locked*

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

diff --git a/src/main/java/org/ldk/structs/ChannelMonitor.java b/src/main/java/org/ldk/structs/ChannelMonitor.java
index b30c18475df834d416e3ae259ad04e590679b3ee..6fe90d57c5b4759a9ed046544bbfa9fb4612530b 100644 (file)
--- a/src/main/java/org/ldk/structs/ChannelMonitor.java
+++ b/src/main/java/org/ldk/structs/ChannelMonitor.java
@@ -7,7 +7,8 @@ public class ChannelMonitor extends CommonBase {
        ChannelMonitor(Object _dummy, long ptr) { super(ptr); }
        @Override @SuppressWarnings("deprecation")
        protected void finalize() throws Throwable {
-               bindings.ChannelMonitor_free(ptr); super.finalize();
+               super.finalize();
+               bindings.ChannelMonitor_free(ptr);
        }
 
        // Skipped ChannelMonitor_update_monitor
@@ -22,7 +23,7 @@ public class ChannelMonitor extends CommonBase {
        // Skipped ChannelMonitor_get_latest_holder_commitment_txn
        // Skipped ChannelMonitor_block_connected
        public void block_disconnected(byte[] header, int height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
-               bindings.ChannelMonitor_block_disconnected(this.ptr, header, height, broadcaster.ptr, fee_estimator.ptr, logger.ptr);
+               bindings.ChannelMonitor_block_disconnected(this.ptr, header, height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
                this.ptrs_to.add(broadcaster);
                this.ptrs_to.add(fee_estimator);
                this.ptrs_to.add(logger);