Merge remote-tracking branch 'origin/main'

platypusguy · Jan 30, 2025 · 8082f1e · 8082f1e
2 parents 15545cb + 1d7cb36
commit 8082f1e
Show file tree

Hide file tree

Showing 3 changed files with 267 additions and 72 deletions.
diff --git a/src/gfunction/Traps.go b/src/gfunction/Traps.go
@@ -159,13 +159,13 @@ func Load_Traps() {
 	MethodSignatures["sun/security/util/Debug.getInstance(Ljava/lang/String;)Lsun/security/util/Debug;"] =
 		GMeth{
 			ParamSlots: 1,
-			GFunction:  trapFunction,
+			GFunction:  returnNull,
 		}
 
 	MethodSignatures["sun/security/util/Debug.getInstance(Ljava/lang/String;Ljava/lang/String;)Lsun/security/util/Debug;"] =
 		GMeth{
 			ParamSlots: 2,
-			GFunction:  trapFunction,
+			GFunction:  returnNull,
 		}
 
 }

diff --git a/src/gfunction/gfunction.go b/src/gfunction/gfunction.go
@@ -76,6 +76,11 @@ func justReturn([]interface{}) interface{} {
 	return object.StringObjectFromGoString("justReturn")
 }
 
+// return a Java null object.
+func returnNull([]interface{}) interface{} {
+	return object.Null
+}
+
 func returnCharsetName([]interface{}) interface{} {
 	return object.StringObjectFromGoString(globals.GetCharsetName())
 }