X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FAPIError.java;h=fdcfc09b7bb4b43601b9794f8890442439544434;hb=fd59673b53bd5e74459132e685a10258b3c1d5a6;hp=40704400b512c24e6e696f568d1ede5de3826a1e;hpb=371e82300e5de678404f0addc47a20636077df5d;p=ldk-java diff --git a/src/main/java/org/ldk/structs/APIError.java b/src/main/java/org/ldk/structs/APIError.java index 40704400..fdcfc09b 100644 --- a/src/main/java/org/ldk/structs/APIError.java +++ b/src/main/java/org/ldk/structs/APIError.java @@ -11,9 +11,8 @@ public class APIError extends CommonBase { @Override @SuppressWarnings("deprecation") protected void finalize() throws Throwable { super.finalize(); - bindings.APIError_free(ptr); + if (ptr != 0) { bindings.APIError_free(ptr); } } - long conv_to_c() { assert false; return 0; /* Should only be called on subclasses */ } static APIError constr_from_ptr(long ptr) { bindings.LDKAPIError raw_val = bindings.LDKAPIError_ref_from_ptr(ptr); if (raw_val.getClass() == bindings.LDKAPIError.APIMisuseError.class) { @@ -35,43 +34,38 @@ public class APIError extends CommonBase { } public final static class APIMisuseError extends APIError { - public byte[] err; + public final byte[] err; private APIMisuseError(long ptr, bindings.LDKAPIError.APIMisuseError obj) { super(null, ptr); this.err = obj.err; } - @Override long conv_to_c() { return 0; /*XXX*/ } } public final static class FeeRateTooHigh extends APIError { - public byte[] err; - public int feerate; + public final byte[] err; + public final int feerate; private FeeRateTooHigh(long ptr, bindings.LDKAPIError.FeeRateTooHigh obj) { super(null, ptr); this.err = obj.err; this.feerate = obj.feerate; } - @Override long conv_to_c() { return 0; /*XXX*/ } } public final static class RouteError extends APIError { - public String err; + public final String err; private RouteError(long ptr, bindings.LDKAPIError.RouteError obj) { super(null, ptr); this.err = obj.err; } - @Override long conv_to_c() { return 0; /*XXX*/ } } public final static class ChannelUnavailable extends APIError { - public byte[] err; + public final byte[] err; private ChannelUnavailable(long ptr, bindings.LDKAPIError.ChannelUnavailable obj) { super(null, ptr); this.err = obj.err; } - @Override long conv_to_c() { return 0; /*XXX*/ } } public final static class MonitorUpdateFailed extends APIError { private MonitorUpdateFailed(long ptr, bindings.LDKAPIError.MonitorUpdateFailed obj) { super(null, ptr); } - @Override long conv_to_c() { return 0; /*XXX*/ } } }