X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FAPIError.java;h=ac94c9ce3ee5d9607ce9543fad480498ff38d8fd;hb=890e35a4387758c0447aab34166caa579bbf3a08;hp=1410b0e51d6954c751f9b7528ab0bb9956d0636b;hpb=f3e670e9341decac613d33fc52febf19cea32f20;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/APIError.java b/src/main/java/org/ldk/structs/APIError.java
index 1410b0e5..ac94c9ce 100644
--- a/src/main/java/org/ldk/structs/APIError.java
+++ b/src/main/java/org/ldk/structs/APIError.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;
 
 
@@ -50,7 +51,7 @@ public class APIError extends CommonBase {
 		/**
 		 * A human-readable error message
 		*/
-		public final String err;
+		public final java.lang.String err;
 		private APIMisuseError(long ptr, bindings.LDKAPIError.APIMisuseError obj) {
 			super(null, ptr);
 			this.err = obj.err;
@@ -65,7 +66,7 @@ public class APIError extends CommonBase {
 		/**
 		 * A human-readable error message
 		*/
-		public final String err;
+		public final java.lang.String err;
 		/**
 		 * The feerate which was too high.
 		*/
@@ -84,7 +85,7 @@ public class APIError extends CommonBase {
 		/**
 		 * A human-readable error message
 		*/
-		public final String err;
+		public final java.lang.String err;
 		private RouteError(long ptr, bindings.LDKAPIError.RouteError obj) {
 			super(null, ptr);
 			this.err = obj.err;
@@ -99,7 +100,7 @@ public class APIError extends CommonBase {
 		/**
 		 * A human-readable error message
 		*/
-		public final String err;
+		public final java.lang.String err;
 		private ChannelUnavailable(long ptr, bindings.LDKAPIError.ChannelUnavailable obj) {
 			super(null, ptr);
 			this.err = obj.err;
@@ -128,17 +129,18 @@ public class APIError extends CommonBase {
 		/**
 		 * The incompatible shutdown script.
 		*/
-		public final ShutdownScript script;
+		public final org.ldk.structs.ShutdownScript script;
 		private IncompatibleShutdownScript(long ptr, bindings.LDKAPIError.IncompatibleShutdownScript obj) {
 			super(null, ptr);
 			long script = obj.script;
-			ShutdownScript script_hu_conv = null; if (script < 0 || script > 4096) { script_hu_conv = new ShutdownScript(null, script); }
-			script_hu_conv.ptrs_to.add(this);
+			org.ldk.structs.ShutdownScript script_hu_conv = null; if (script < 0 || script > 4096) { script_hu_conv = new org.ldk.structs.ShutdownScript(null, script); }
+			if (script_hu_conv != null) { script_hu_conv.ptrs_to.add(this); };
 			this.script = script_hu_conv;
 		}
 	}
 	long clone_ptr() {
 		long ret = bindings.APIError_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -147,9 +149,10 @@ public class APIError extends CommonBase {
 	 */
 	public APIError clone() {
 		long ret = bindings.APIError_clone(this.ptr);
+		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		APIError ret_hu_conv = APIError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.APIError ret_hu_conv = org.ldk.structs.APIError.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -158,9 +161,10 @@ public class APIError extends CommonBase {
 	 */
 	public static APIError apimisuse_error(java.lang.String err) {
 		long ret = bindings.APIError_apimisuse_error(err);
+		Reference.reachabilityFence(err);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		APIError ret_hu_conv = APIError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.APIError ret_hu_conv = org.ldk.structs.APIError.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -169,9 +173,11 @@ public class APIError extends CommonBase {
 	 */
 	public static APIError fee_rate_too_high(java.lang.String err, int feerate) {
 		long ret = bindings.APIError_fee_rate_too_high(err, feerate);
+		Reference.reachabilityFence(err);
+		Reference.reachabilityFence(feerate);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		APIError ret_hu_conv = APIError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.APIError ret_hu_conv = org.ldk.structs.APIError.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -180,9 +186,10 @@ public class APIError extends CommonBase {
 	 */
 	public static APIError route_error(java.lang.String err) {
 		long ret = bindings.APIError_route_error(err);
+		Reference.reachabilityFence(err);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		APIError ret_hu_conv = APIError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.APIError ret_hu_conv = org.ldk.structs.APIError.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -191,9 +198,10 @@ public class APIError extends CommonBase {
 	 */
 	public static APIError channel_unavailable(java.lang.String err) {
 		long ret = bindings.APIError_channel_unavailable(err);
+		Reference.reachabilityFence(err);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		APIError ret_hu_conv = APIError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.APIError ret_hu_conv = org.ldk.structs.APIError.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -203,8 +211,8 @@ public class APIError extends CommonBase {
 	public static APIError monitor_update_failed() {
 		long ret = bindings.APIError_monitor_update_failed();
 		if (ret >= 0 && ret <= 4096) { return null; }
-		APIError ret_hu_conv = APIError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.APIError ret_hu_conv = org.ldk.structs.APIError.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -212,10 +220,12 @@ public class APIError extends CommonBase {
 	 * Utility method to constructs a new IncompatibleShutdownScript-variant APIError
 	 */
 	public static APIError incompatible_shutdown_script(ShutdownScript script) {
-		long ret = bindings.APIError_incompatible_shutdown_script(script == null ? 0 : script.ptr & ~1);
+		long ret = bindings.APIError_incompatible_shutdown_script(script == null ? 0 : script.ptr);
+		Reference.reachabilityFence(script);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		APIError ret_hu_conv = APIError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.APIError ret_hu_conv = org.ldk.structs.APIError.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(script); };
 		return ret_hu_conv;
 	}