MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

ExcludeCompilerOutputPolicy: null-checks (EA-120157)

Browse Source
This commit is contained in:
Tagir Valeev
2018-05-10 10:48:33 +07:00
parent 615b83a715
commit 40b638822c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/openapi/roots/impl/ExcludeCompilerOutputPolicy.java
+6 -2
View File
@@ -39,7 +39,8 @@ public class ExcludeCompilerOutputPolicy implements DirectoryIndexExcludePolicy
@NotNull
@Override
public VirtualFile[] getExcludeRootsForProject() {
VirtualFile outputPath = CompilerProjectExtension.getInstance(myProject).getCompilerOutput();
CompilerProjectExtension projectExtension = CompilerProjectExtension.getInstance(myProject);
VirtualFile outputPath = projectExtension == null ? null : projectExtension.getCompilerOutput();
if (outputPath != null) {
return new VirtualFile[] { outputPath };
}
@@ -55,7 +56,10 @@ public class ExcludeCompilerOutputPolicy implements DirectoryIndexExcludePolicy
return VirtualFilePointer.EMPTY_ARRAY;
}
if (extension.isCompilerOutputPathInherited()) {
ContainerUtil.addIfNotNull(result, CompilerProjectExtension.getInstance(myProject).getCompilerOutputPointer());
CompilerProjectExtension projectExtension = CompilerProjectExtension.getInstance(myProject);
if (projectExtension != null) {
ContainerUtil.addIfNotNull(result, projectExtension.getCompilerOutputPointer());
}
}
else {
if (!extension.isExcludeOutput()) return VirtualFilePointer.EMPTY_ARRAY;