Skip to content

JavaKit: map NULL jstring to the empty string #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2024
Merged

JavaKit: map NULL jstring to the empty string #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Sources/JavaKit/BridgedValues/JavaValue+String.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ extension String: JavaValue {
}

public init(fromJNI value: JNIType, in environment: JNIEnvironment) {
guard let value else {
self.init()
return
}
let cString = environment.interface.GetStringUTFChars(environment, value, nil)!
defer { environment.interface.ReleaseStringUTFChars(environment, value, cString) }
self = String(cString: cString)
Expand Down
6 changes: 6 additions & 0 deletions Tests/JavaKitTests/BasicRuntimeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ class BasicRuntimeTests: XCTestCase {
XCTAssertEqual(String(describing: error), "org/swift/javakit/Nonexistent")
}
}

func testNullJavaStringConversion() throws {
let environment = try jvm.environment()
let nullString = String(fromJNI: nil, in: environment)
XCTAssertEqual(nullString, "")
}
}

@JavaClass("org.swift.javakit.Nonexistent")
Expand Down