Skip to content

Commit c72c495

Browse files
Fix classpath handling in EspressoLauncher
It should behave the same as the standard launcher.
1 parent f0529be commit c72c495

File tree

1 file changed

+3
-5
lines changed
  • espresso/src/com.oracle.truffle.espresso.launcher/src/com/oracle/truffle/espresso/launcher

1 file changed

+3
-5
lines changed

espresso/src/com.oracle.truffle.espresso.launcher/src/com/oracle/truffle/espresso/launcher/EspressoLauncher.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -367,14 +367,12 @@ protected List<String> preprocessArguments(List<String> arguments, Map<String, S
367367
if (classpath == null) {
368368
// (3) the environment variable CLASSPATH
369369
classpath = System.getenv("CLASSPATH");
370-
if (classpath == null) {
371-
// (4) the current working directory only
372-
classpath = ".";
373-
}
374370
}
375371
}
376372

377-
espressoOptions.put("java.Classpath", classpath);
373+
if (classpath != null) {
374+
espressoOptions.put("java.Classpath", classpath);
375+
}
378376

379377
if (!isRelaxStaticObjectSafetyChecksSet) {
380378
// Since Espresso has a verifier, the Static Object Model does not need to perform shape

0 commit comments

Comments
 (0)