Merge pull request swiftlang#150 from PADL/lhoward/class-path-validate

PADL · Nov 5, 2024 · 3436f46 · 3436f46
2 parents cad41a5 + b08446a
commit 3436f46
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/Sources/JavaKit/JavaKitVM/JavaVirtualMachine.swift b/Sources/JavaKit/JavaKitVM/JavaVirtualMachine.swift
@@ -12,6 +12,12 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 typealias JavaVMPointer = UnsafeMutablePointer<JavaVM?>
 
 public final class JavaVirtualMachine: @unchecked Sendable {
@@ -54,6 +60,12 @@ public final class JavaVirtualMachine: @unchecked Sendable {
     // Construct the complete list of VM options.
     var allVMOptions: [String] = []
     if !classPath.isEmpty {
+      let fileManager = FileManager.default
+      for path in classPath {
+        if !fileManager.fileExists(atPath: path) {
+          throw JavaKitError.classPathEntryNotFound(entry: path, classPath: classPath)
+        }
+      }
       let colonSeparatedClassPath = classPath.joined(separator: ":")
       allVMOptions.append("-Djava.class.path=\(colonSeparatedClassPath)")
     }
@@ -268,4 +280,8 @@ extension JavaVirtualMachine {
       }
     }
   }
+
+  enum JavaKitError: Error {
+    case classPathEntryNotFound(entry: String, classPath: [String])
+  }
 }