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

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

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

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