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

EA-40780 fix NPE

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-11-20 15:58:48 +04:00
parent a6fa1b8711
commit 502ebc4130
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/util/AndroidResourceUtil.java
+10 -2
View File
@@ -169,7 +169,11 @@ public class AndroidResourceUtil {
if (packageName != null) {
ModulePackageIndex.getInstance(module).getDirsByPackageName(packageName, false).forEach(new Processor<VirtualFile>() {
public boolean process(final VirtualFile directory) {
dirs.add(PsiManager.getInstance(project).findDirectory(directory));
final PsiDirectory psiDir = PsiManager.getInstance(project).findDirectory(directory);
if (psiDir != null) {
dirs.add(psiDir);
}
return true;
}
});
@@ -184,7 +188,11 @@ public class AndroidResourceUtil {
if (ownPackageName != null && !ownPackageName.equals(packageName)) {
ModulePackageIndex.getInstance(module).getDirsByPackageName(ownPackageName, false).forEach(new Processor<VirtualFile>() {
public boolean process(final VirtualFile directory) {
dirs.add(PsiManager.getInstance(project).findDirectory(directory));
final PsiDirectory psiDir = PsiManager.getInstance(project).findDirectory(directory);
if (psiDir != null) {
dirs.add(psiDir);
}
return true;
}
});