mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 211522 fix NPEs.

Browse source
This commit is contained in:
Ken Ryall 2008-01-18 21:05:12 +00:00
parent d8ed4e7b96
commit 2997c0991e
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java
View file

@ -2713,8 +2713,11 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager {
generateCElementDeltasFromLanguageDelta(el, ld, list); generateCElementDeltasFromLanguageDelta(el, ld, list);
} else { } else {
if(newRcDes.getType() == ICSettingBase.SETTING_FOLDER){ if(newRcDes.getType() == ICSettingBase.SETTING_FOLDER){
ICFolderDescription oldFoDes = oldRcDes.getType() == ICSettingBase.SETTING_FOLDER ? ICFolderDescription oldFoDes = null;
(ICFolderDescription)oldRcDes : null; if (oldRcDes != null) {
if (oldRcDes.getType() == ICSettingBase.SETTING_FOLDER)
oldFoDes = (ICFolderDescription)oldRcDes;
}
ICDescriptionDelta folderDelta = createDelta((ICFolderDescription)newRcDes, oldFoDes); ICDescriptionDelta folderDelta = createDelta((ICFolderDescription)newRcDes, oldFoDes);
if(folderDelta != null){ if(folderDelta != null){
ICDescriptionDelta children[] = folderDelta.getChildren(); ICDescriptionDelta children[] = folderDelta.getChildren();
@ -3306,7 +3309,7 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager {
return null; return null;
ICResourceDescription rcDes = cfgDes.getResourceDescription(path, false); ICResourceDescription rcDes = cfgDes.getResourceDescription(path, false);
if(!ignoreExcludeStatus && rcDes.isExcluded()) if(rcDes == null || (!ignoreExcludeStatus && rcDes.isExcluded()))
return null; return null;
if(rcDes.getType() == ICSettingBase.SETTING_FOLDER){ if(rcDes.getType() == ICSettingBase.SETTING_FOLDER){