X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FPaymentError.java;h=d6f33c4f57e4b444fe518f84523a4a47ebf2ddb8;hb=300b54d26fe5ed89f472ef821ebf67d56c917e49;hp=7f1d4935f8b6d41898060ac2b286725735a0ee86;hpb=f3e670e9341decac613d33fc52febf19cea32f20;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/PaymentError.java b/src/main/java/org/ldk/structs/PaymentError.java
index 7f1d4935..d6f33c4f 100644
--- a/src/main/java/org/ldk/structs/PaymentError.java
+++ b/src/main/java/org/ldk/structs/PaymentError.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;
 
 
@@ -36,7 +37,7 @@ public class PaymentError extends CommonBase {
 	 * An error resulting from the provided [`Invoice`] or payment hash.
 	 */
 	public final static class Invoice extends PaymentError {
-		public final String invoice;
+		public final java.lang.String invoice;
 		private Invoice(long ptr, bindings.LDKPaymentError.Invoice obj) {
 			super(null, ptr);
 			this.invoice = obj.invoice;
@@ -46,12 +47,12 @@ public class PaymentError extends CommonBase {
 	 * An error occurring when finding a route.
 	 */
 	public final static class Routing extends PaymentError {
-		public final LightningError routing;
+		public final org.ldk.structs.LightningError routing;
 		private Routing(long ptr, bindings.LDKPaymentError.Routing obj) {
 			super(null, ptr);
 			long routing = obj.routing;
-			LightningError routing_hu_conv = null; if (routing < 0 || routing > 4096) { routing_hu_conv = new LightningError(null, routing); }
-			routing_hu_conv.ptrs_to.add(this);
+			org.ldk.structs.LightningError routing_hu_conv = null; if (routing < 0 || routing > 4096) { routing_hu_conv = new org.ldk.structs.LightningError(null, routing); }
+			if (routing_hu_conv != null) { routing_hu_conv.ptrs_to.add(this); };
 			this.routing = routing_hu_conv;
 		}
 	}
@@ -59,17 +60,18 @@ public class PaymentError extends CommonBase {
 	 * An error occurring when sending a payment.
 	 */
 	public final static class Sending extends PaymentError {
-		public final PaymentSendFailure sending;
+		public final org.ldk.structs.PaymentSendFailure sending;
 		private Sending(long ptr, bindings.LDKPaymentError.Sending obj) {
 			super(null, ptr);
 			long sending = obj.sending;
-			PaymentSendFailure sending_hu_conv = PaymentSendFailure.constr_from_ptr(sending);
-			sending_hu_conv.ptrs_to.add(this);
+			org.ldk.structs.PaymentSendFailure sending_hu_conv = org.ldk.structs.PaymentSendFailure.constr_from_ptr(sending);
+			if (sending_hu_conv != null) { sending_hu_conv.ptrs_to.add(this); };
 			this.sending = sending_hu_conv;
 		}
 	}
 	long clone_ptr() {
 		long ret = bindings.PaymentError_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -78,9 +80,10 @@ public class PaymentError extends CommonBase {
 	 */
 	public PaymentError clone() {
 		long ret = bindings.PaymentError_clone(this.ptr);
+		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		PaymentError ret_hu_conv = PaymentError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.PaymentError ret_hu_conv = org.ldk.structs.PaymentError.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -89,9 +92,10 @@ public class PaymentError extends CommonBase {
 	 */
 	public static PaymentError invoice(java.lang.String a) {
 		long ret = bindings.PaymentError_invoice(a);
+		Reference.reachabilityFence(a);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		PaymentError ret_hu_conv = PaymentError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.PaymentError ret_hu_conv = org.ldk.structs.PaymentError.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -99,10 +103,12 @@ public class PaymentError extends CommonBase {
 	 * Utility method to constructs a new Routing-variant PaymentError
 	 */
 	public static PaymentError routing(LightningError a) {
-		long ret = bindings.PaymentError_routing(a == null ? 0 : a.ptr & ~1);
+		long ret = bindings.PaymentError_routing(a == null ? 0 : a.ptr);
+		Reference.reachabilityFence(a);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		PaymentError ret_hu_conv = PaymentError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.PaymentError ret_hu_conv = org.ldk.structs.PaymentError.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(a); };
 		return ret_hu_conv;
 	}
 
@@ -111,9 +117,10 @@ public class PaymentError extends CommonBase {
 	 */
 	public static PaymentError sending(PaymentSendFailure a) {
 		long ret = bindings.PaymentError_sending(a.ptr);
+		Reference.reachabilityFence(a);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		PaymentError ret_hu_conv = PaymentError.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.PaymentError ret_hu_conv = org.ldk.structs.PaymentError.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}