diff options
| author | Markus Schorn | 2007-06-13 15:57:01 +0000 |
|---|---|---|
| committer | Markus Schorn | 2007-06-13 15:57:01 +0000 |
| commit | 1e695dec9ba23d88f0cd6e7184a5d91c9d06f4c3 (patch) | |
| tree | ffc0a94706773bb266356100c2ebfe6ab14ee053 /build/org.eclipse.cdt.make.core | |
| parent | bd9d9d2a751741b38ee701f0007e56ae76e49725 (diff) | |
| download | org.eclipse.cdt-1e695dec9ba23d88f0cd6e7184a5d91c9d06f4c3.tar.gz org.eclipse.cdt-1e695dec9ba23d88f0cd6e7184a5d91c9d06f4c3.tar.xz org.eclipse.cdt-1e695dec9ba23d88f0cd6e7184a5d91c9d06f4c3.zip | |
Fix for 192406 by Gerhard Schaber, NPE in PerFileSICollector.
Diffstat (limited to 'build/org.eclipse.cdt.make.core')
| -rw-r--r-- | build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/PerFileSICollector.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/PerFileSICollector.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/PerFileSICollector.java index 5738f07ba3d..fa405a8022f 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/PerFileSICollector.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/PerFileSICollector.java @@ -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)); } } |