projects
/
ldk-java
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #117 from TheBlueMatt/2022-08-fix-npe
[ldk-java]
/
src
/
main
/
java
/
org
/
ldk
/
structs
/
Description.java
diff --git
a/src/main/java/org/ldk/structs/Description.java
b/src/main/java/org/ldk/structs/Description.java
index 8e8f68ff63dabcac67d6068c943755d5d32403f5..8d7762d650ec86f9ea1c7c37eb123f15535d26c0 100644
(file)
--- a/
src/main/java/org/ldk/structs/Description.java
+++ b/
src/main/java/org/ldk/structs/Description.java
@@
-4,6
+4,7
@@
import org.ldk.impl.bindings;
import org.ldk.enums.*;
import org.ldk.util.*;
import java.util.Arrays;
import org.ldk.enums.*;
import org.ldk.util.*;
import java.util.Arrays;
+import java.lang.ref.Reference;
import javax.annotation.Nullable;
import javax.annotation.Nullable;
@@
-24,6
+25,7
@@
public class Description extends CommonBase {
long clone_ptr() {
long ret = bindings.Description_clone_ptr(this.ptr);
long clone_ptr() {
long ret = bindings.Description_clone_ptr(this.ptr);
+ Reference.reachabilityFence(this);
return ret;
}
return ret;
}
@@
-32,9
+34,10
@@
public class Description extends CommonBase {
*/
public Description clone() {
long ret = bindings.Description_clone(this.ptr);
*/
public Description clone() {
long ret = bindings.Description_clone(this.ptr);
+ Reference.reachabilityFence(this);
if (ret >= 0 && ret <= 4096) { return null; }
if (ret >= 0 && ret <= 4096) { return null; }
-
Description ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new
Description(null, ret); }
-
ret_hu_conv.ptrs_to.add(this)
;
+
org.ldk.structs.Description ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.
Description(null, ret); }
+
if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); }
;
return ret_hu_conv;
}
return ret_hu_conv;
}
@@
-43,20
+46,30
@@
public class Description extends CommonBase {
*/
public long hash() {
long ret = bindings.Description_hash(this.ptr);
*/
public long hash() {
long ret = bindings.Description_hash(this.ptr);
+ Reference.reachabilityFence(this);
return ret;
}
return ret;
}
+ @Override public int hashCode() {
+ return (int)this.hash();
+ }
/**
* Checks if two Descriptions contain equal inner contents.
* This ignores pointers and is_owned flags and looks at the values in fields.
* Two objects with NULL inner values will be considered "equal" here.
*/
public boolean eq(Description b) {
/**
* Checks if two Descriptions contain equal inner contents.
* This ignores pointers and is_owned flags and looks at the values in fields.
* Two objects with NULL inner values will be considered "equal" here.
*/
public boolean eq(Description b) {
- boolean ret = bindings.Description_eq(this.ptr, b == null ? 0 : b.ptr & ~1);
- this.ptrs_to.add(b);
+ boolean ret = bindings.Description_eq(this.ptr, b == null ? 0 : b.ptr);
+ Reference.reachabilityFence(this);
+ Reference.reachabilityFence(b);
+ if (this != null) { this.ptrs_to.add(b); };
return ret;
}
return ret;
}
+ @Override public boolean equals(Object o) {
+ if (!(o instanceof Description)) return false;
+ return this.eq((Description)o);
+ }
/**
* Creates a new `Description` if `description` is at most 1023 __bytes__ long,
* returns `CreationError::DescriptionTooLong` otherwise
/**
* Creates a new `Description` if `description` is at most 1023 __bytes__ long,
* returns `CreationError::DescriptionTooLong` otherwise
@@
-65,6
+78,7
@@
public class Description extends CommonBase {
*/
public static Result_DescriptionCreationErrorZ of(java.lang.String description) {
long ret = bindings.Description_new(description);
*/
public static Result_DescriptionCreationErrorZ of(java.lang.String description) {
long ret = bindings.Description_new(description);
+ Reference.reachabilityFence(description);
if (ret >= 0 && ret <= 4096) { return null; }
Result_DescriptionCreationErrorZ ret_hu_conv = Result_DescriptionCreationErrorZ.constr_from_ptr(ret);
return ret_hu_conv;
if (ret >= 0 && ret <= 4096) { return null; }
Result_DescriptionCreationErrorZ ret_hu_conv = Result_DescriptionCreationErrorZ.constr_from_ptr(ret);
return ret_hu_conv;
@@
-75,7
+89,8
@@
public class Description extends CommonBase {
*/
public String into_inner() {
String ret = bindings.Description_into_inner(this.ptr);
*/
public String into_inner() {
String ret = bindings.Description_into_inner(this.ptr);
- ;
+ Reference.reachabilityFence(this);
+ if (this != null) { this.ptrs_to.add(this); };
return ret;
}
return ret;
}