Skip to content

Commit cbdf413

Browse files
committed
fix a potential NPE
1 parent 1dcfdc1 commit cbdf413

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1727,16 +1727,16 @@ public void initializeHomeAndPrefixPaths(Env newEnv, String languageHome) {
17271727
}
17281728
};
17291729
for (Supplier<?> homeCandidateSupplier : homeCandidates) {
1730-
final TruffleFile homeCandidate = (TruffleFile) homeCandidateSupplier.get();
1731-
if (homeCandidate == null) {
1732-
continue;
1733-
}
17341730
sysPrefix = newEnv.getOptions().get(PythonOptions.SysPrefix);
17351731
basePrefix = newEnv.getOptions().get(PythonOptions.SysBasePrefix);
17361732
coreHome = newEnv.getOptions().get(PythonOptions.CoreHome);
17371733
stdLibHome = newEnv.getOptions().get(PythonOptions.StdLibHome);
17381734
capiHome = newEnv.getOptions().get(PythonOptions.CAPI);
17391735
jniHome = newEnv.getOptions().get(PythonOptions.JNIHome);
1736+
final TruffleFile homeCandidate = (TruffleFile) homeCandidateSupplier.get();
1737+
if (homeCandidate == null) {
1738+
continue;
1739+
}
17401740
boolean homeSeemsValid = !coreHome.isEmpty() && !stdLibHome.isEmpty();
17411741

17421742
Python3Core.writeInfo(() -> MessageFormat.format("Initial locations:" +

0 commit comments

Comments
 (0)