Merge pull request swiftlang#158 from PADL/lhoward/155

PADL · Nov 7, 2024 · 79237aa · 79237aa
2 parents 651cc89 + 4fa32a1
commit 79237aa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Sources/JavaKit/BridgedValues/JavaValue+String.swift b/Sources/JavaKit/BridgedValues/JavaValue+String.swift
@@ -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)

diff --git a/Tests/JavaKitTests/BasicRuntimeTests.swift b/Tests/JavaKitTests/BasicRuntimeTests.swift
@@ -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")