X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelMessageHandler.java;h=ccb88fc764da249053177db91bfc37f1a667e0bc;hb=227672ae3d27961f63d45913aad01dbae1f53e99;hp=0e5c15bbfb43da4aef32de0d9574f5b70599328d;hpb=9760d533f7ecac9bb7a8249f9b557e3f995c276d;p=ldk-java diff --git a/src/main/java/org/ldk/structs/ChannelMessageHandler.java b/src/main/java/org/ldk/structs/ChannelMessageHandler.java index 0e5c15bb..ccb88fc7 100644 --- a/src/main/java/org/ldk/structs/ChannelMessageHandler.java +++ b/src/main/java/org/ldk/structs/ChannelMessageHandler.java @@ -119,14 +119,14 @@ public class ChannelMessageHandler extends CommonBase { impl_holder.held = new ChannelMessageHandler(new bindings.LDKChannelMessageHandler() { @Override public void handle_open_channel(byte[] their_node_id, long their_features, long msg) { org.ldk.structs.InitFeatures their_features_hu_conv = null; if (their_features < 0 || their_features > 4096) { their_features_hu_conv = new org.ldk.structs.InitFeatures(null, their_features); } - their_features_hu_conv.ptrs_to.add(this); + if (their_features_hu_conv != null) { their_features_hu_conv.ptrs_to.add(this); }; org.ldk.structs.OpenChannel msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new org.ldk.structs.OpenChannel(null, msg); } arg.handle_open_channel(their_node_id, their_features_hu_conv, msg_hu_conv); Reference.reachabilityFence(arg); } @Override public void handle_accept_channel(byte[] their_node_id, long their_features, long msg) { org.ldk.structs.InitFeatures their_features_hu_conv = null; if (their_features < 0 || their_features > 4096) { their_features_hu_conv = new org.ldk.structs.InitFeatures(null, their_features); } - their_features_hu_conv.ptrs_to.add(this); + if (their_features_hu_conv != null) { their_features_hu_conv.ptrs_to.add(this); }; org.ldk.structs.AcceptChannel msg_hu_conv = null; if (msg < 0 || msg > 4096) { msg_hu_conv = new org.ldk.structs.AcceptChannel(null, msg); } arg.handle_accept_channel(their_node_id, their_features_hu_conv, msg_hu_conv); Reference.reachabilityFence(arg); @@ -243,8 +243,8 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(their_features); Reference.reachabilityFence(msg); - this.ptrs_to.add(their_features); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(their_features); }; + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -256,8 +256,8 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(their_features); Reference.reachabilityFence(msg); - this.ptrs_to.add(their_features); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(their_features); }; + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -268,7 +268,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -279,7 +279,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -290,7 +290,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -302,8 +302,8 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(their_features); Reference.reachabilityFence(msg); - this.ptrs_to.add(their_features); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(their_features); }; + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -314,7 +314,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -325,7 +325,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -336,7 +336,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -347,7 +347,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -358,7 +358,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -369,7 +369,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -380,7 +380,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -391,7 +391,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -402,7 +402,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -426,7 +426,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -437,7 +437,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -448,7 +448,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } /** @@ -459,7 +459,7 @@ public class ChannelMessageHandler extends CommonBase { Reference.reachabilityFence(this); Reference.reachabilityFence(their_node_id); Reference.reachabilityFence(msg); - this.ptrs_to.add(msg); + if (this != null) { this.ptrs_to.add(msg); }; } }