[GR-14629] Hotfix: be more forgiving if CoreHome is not set.

fangerer · fangerer · commit 4eb7a17c546b · 2019-03-27T05:08:47.000-07:00
PullRequest: graalpython/456
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/InteropModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/InteropModuleBuiltins.java
@@ -104,7 +104,7 @@ public void initialize(PythonCore core) {
         try {
             TruffleFile coreDir = env.getTruffleFile(coreHome);
             TruffleFile docDir = coreDir.resolveSibling("doc");
-            if (docDir.exists() || (docDir = coreDir.getParent().resolveSibling("doc")).exists()) {
+            if (docDir.exists() || docDir.getParent() != null && (docDir = coreDir.getParent().resolveSibling("doc")).exists()) {
                 builtinConstants.put(SpecialAttributeNames.__DOC__, new String(docDir.resolve("INTEROP.md").readAllBytes()));
             }
         } catch (SecurityException | IOException e) {

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public void initialize(PythonCore core) {`
`104`	`104`	`try {`
`105`	`105`	`TruffleFile coreDir = env.getTruffleFile(coreHome);`
`106`	`106`	`TruffleFile docDir = coreDir.resolveSibling("doc");`
`107`		`- if (docDir.exists() \|\| (docDir = coreDir.getParent().resolveSibling("doc")).exists()) {`
	`107`	`+ if (docDir.exists() \|\| docDir.getParent() != null && (docDir = coreDir.getParent().resolveSibling("doc")).exists()) {`
`108`	`108`	`builtinConstants.put(SpecialAttributeNames.__DOC__, new String(docDir.resolve("INTEROP.md").readAllBytes()));`
`109`	`109`	`}`
`110`	`110`	`} catch (SecurityException \| IOException e) {`