X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FMessageHandler.java;h=389e2a88e1ed032bc3cae30e9bb27adca23724ec;hb=fed2245c60159f6c074c9ed5c0f3ce273ad9841b;hp=32fc51a326ac4a5f2b27014f6fb4a6f73b39e18b;hpb=3d559f3266fde7c6a21248c10d9a7145125b5e69;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/MessageHandler.java b/src/main/java/org/ldk/structs/MessageHandler.java
index 32fc51a3..389e2a88 100644
--- a/src/main/java/org/ldk/structs/MessageHandler.java
+++ b/src/main/java/org/ldk/structs/MessageHandler.java
@@ -2,44 +2,49 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
 
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class MessageHandler extends CommonBase {
 	MessageHandler(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.MessageHandler_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.MessageHandler_free(ptr); }
 	}
 
-	public ChannelMessageHandler get_chan_handler(MessageHandler this_ptr) {
-		ChannelMessageHandler ret = new ChannelMessageHandler(null, bindings.MessageHandler_get_chan_handler(this_ptr.ptr & ~1));
-		ret.ptrs_to.add(this);
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	public ChannelMessageHandler get_chan_handler() {
+		long ret = bindings.MessageHandler_get_chan_handler(this.ptr);
+		ChannelMessageHandler ret_hu_conv = new ChannelMessageHandler(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public void set_chan_handler(MessageHandler this_ptr, ChannelMessageHandler val) {
-		bindings.MessageHandler_set_chan_handler(this_ptr.ptr & ~1, val.ptr);
-		this.ptrs_to.add(this_ptr);
+	public void set_chan_handler(ChannelMessageHandler val) {
+		bindings.MessageHandler_set_chan_handler(this.ptr, val == null ? 0 : val.ptr);
 		this.ptrs_to.add(val);
 	}
 
-	public RoutingMessageHandler get_route_handler(MessageHandler this_ptr) {
-		RoutingMessageHandler ret = new RoutingMessageHandler(null, bindings.MessageHandler_get_route_handler(this_ptr.ptr & ~1));
-		ret.ptrs_to.add(this);
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	public RoutingMessageHandler get_route_handler() {
+		long ret = bindings.MessageHandler_get_route_handler(this.ptr);
+		RoutingMessageHandler ret_hu_conv = new RoutingMessageHandler(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public void set_route_handler(MessageHandler this_ptr, RoutingMessageHandler val) {
-		bindings.MessageHandler_set_route_handler(this_ptr.ptr & ~1, val.ptr);
-		this.ptrs_to.add(this_ptr);
+	public void set_route_handler(RoutingMessageHandler val) {
+		bindings.MessageHandler_set_route_handler(this.ptr, val == null ? 0 : val.ptr);
 		this.ptrs_to.add(val);
 	}
 
-	public MessageHandler(ChannelMessageHandler chan_handler_arg, RoutingMessageHandler route_handler_arg) {
-		super(bindings.MessageHandler_new(chan_handler_arg.ptr, route_handler_arg.ptr));
-		this.ptrs_to.add(chan_handler_arg);
-		this.ptrs_to.add(route_handler_arg);
+	public static MessageHandler constructor_new(ChannelMessageHandler chan_handler_arg, RoutingMessageHandler route_handler_arg) {
+		long ret = bindings.MessageHandler_new(chan_handler_arg == null ? 0 : chan_handler_arg.ptr, route_handler_arg == null ? 0 : route_handler_arg.ptr);
+		MessageHandler ret_hu_conv = new MessageHandler(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		ret_hu_conv.ptrs_to.add(chan_handler_arg);
+		ret_hu_conv.ptrs_to.add(route_handler_arg);
+		return ret_hu_conv;
 	}
 
 }