X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FErrorAction.java;h=efe34dd55c7401786611254727266e07f6265807;hb=3c88e2f6e84c7f38723ff162ca72d613df5eeb97;hp=e5ccec8d4c8606978893365203868c49adfbadfb;hpb=371e82300e5de678404f0addc47a20636077df5d;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ErrorAction.java b/src/main/java/org/ldk/structs/ErrorAction.java index e5ccec8d..efe34dd5 100644 --- a/src/main/java/org/ldk/structs/ErrorAction.java +++ b/src/main/java/org/ldk/structs/ErrorAction.java @@ -11,9 +11,8 @@ public class ErrorAction extends CommonBase { @Override @SuppressWarnings("deprecation") protected void finalize() throws Throwable { super.finalize(); - bindings.ErrorAction_free(ptr); + if (ptr != 0) { bindings.ErrorAction_free(ptr); } } - long conv_to_c() { assert false; return 0; /* Should only be called on subclasses */ } static ErrorAction constr_from_ptr(long ptr) { bindings.LDKErrorAction raw_val = bindings.LDKErrorAction_ref_from_ptr(ptr); if (raw_val.getClass() == bindings.LDKErrorAction.DisconnectPeer.class) { @@ -29,29 +28,26 @@ public class ErrorAction extends CommonBase { } public final static class DisconnectPeer extends ErrorAction { - public ErrorMessage msg; + public final ErrorMessage msg; private DisconnectPeer(long ptr, bindings.LDKErrorAction.DisconnectPeer obj) { super(null, ptr); long msg = obj.msg; ErrorMessage msg_hu_conv = new ErrorMessage(null, msg); this.msg = msg_hu_conv; } - @Override long conv_to_c() { return 0; /*XXX*/ } } public final static class IgnoreError extends ErrorAction { private IgnoreError(long ptr, bindings.LDKErrorAction.IgnoreError obj) { super(null, ptr); } - @Override long conv_to_c() { return 0; /*XXX*/ } } public final static class SendErrorMessage extends ErrorAction { - public ErrorMessage msg; + public final ErrorMessage msg; private SendErrorMessage(long ptr, bindings.LDKErrorAction.SendErrorMessage obj) { super(null, ptr); long msg = obj.msg; ErrorMessage msg_hu_conv = new ErrorMessage(null, msg); this.msg = msg_hu_conv; } - @Override long conv_to_c() { return 0; /*XXX*/ } } }