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

Fix for 192406 by Gerhard Schaber, NPE in PerFileSICollector.

Browse source
This commit is contained in:
Markus Schorn 2007-06-13 15:57:01 +00:00
parent bd9d9d2a75
commit 1e695dec9b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/PerFileSICollector.java
View file

@ -360,7 +360,9 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
}
else {
Set oldFileSet = (Set) sid.commandIdToFilesMap.get(oldCommandId);
oldFileSet.remove(file);
if (oldFileSet != null) {
oldFileSet.remove(file);
}
}
}
if (change) {
@ -498,7 +500,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
for (Iterator i = sid.commandIdCommandMap.keySet().iterator(); i.hasNext(); ) {
Integer cmdId = (Integer) i.next();
Set fileSet = (Set) sid.commandIdToFilesMap.get(cmdId);
if (!fileSet.isEmpty()) {
if (fileSet != null && !fileSet.isEmpty()) {
rv.add(sid.commandIdCommandMap.get(cmdId));
}
}