mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Bug 408635. Fixed NPE

Browse source
This commit is contained in:
Sergey Prigogin 2013-05-21 15:54:52 -07:00
parent 99767b4630
commit 7a1fd480ce
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/InclusionContext.java
View file

@ -169,15 +169,17 @@ public class InclusionContext {
for (IPath path : fHeadersToInclude) { for (IPath path : fHeadersToInclude) {
if (!exportedHeaders.contains(path)) { if (!exportedHeaders.contains(path)) {
IIndexFile file = filesByPath.get(path); IIndexFile file = filesByPath.get(path);
ArrayDeque<IIndexFile> queue = new ArrayDeque<IIndexFile>(); if (file != null) { // file can be null if the header was not indexed.
queue.add(file); ArrayDeque<IIndexFile> queue = new ArrayDeque<IIndexFile>();
while ((file = queue.pollFirst()) != null) { queue.add(file);
for (IIndexInclude include : file.getIncludes()) { while ((file = queue.pollFirst()) != null) {
if (include.isIncludedFileExported()) { for (IIndexInclude include : file.getIncludes()) {
file = fIndex.resolveInclude(include); if (include.isIncludedFileExported()) {
if (file != null) { file = fIndex.resolveInclude(include);
if (exportedHeaders.add(getPath(file))) if (file != null) {
queue.add(file); if (exportedHeaders.add(getPath(file)))
queue.add(file);
}
} }
} }
} }