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

more NPE fixes

Browse Source
This commit is contained in:
peter
2010-06-27 10:18:09 +04:00
parent 6b945f6032
commit 8d6a63fed3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/psi/search/GlobalSearchScope.java
+2 -2
View File
@@ -263,7 +263,7 @@ public abstract class GlobalSearchScope extends SearchScope implements ProjectAw
private final String myDisplayName;
private IntersectionScope(@NotNull GlobalSearchScope scope1, @NotNull GlobalSearchScope scope2, String displayName) {
super(scope1.getProject());
super(scope1.getProject() == null ? scope2.getProject() : scope1.getProject());
myScope1 = scope1;
myScope2 = scope2;
myDisplayName = displayName;
@@ -316,7 +316,7 @@ public abstract class GlobalSearchScope extends SearchScope implements ProjectAw
private final String myDisplayName;
private UnionScope(@NotNull GlobalSearchScope scope1, @NotNull GlobalSearchScope scope2, String displayName) {
super(scope1.getProject() == scope2.getProject() ? scope1.getProject() : null);
super(scope1.getProject() == null ? scope2.getProject() : scope1.getProject());
myScope1 = scope1;
myScope2 = scope2;
myDisplayName = displayName;