From 2997c0991eb901b84cd36716fa2bc343bf9ab196 Mon Sep 17 00:00:00 2001 From: Ken Ryall Date: Fri, 18 Jan 2008 21:05:12 +0000 Subject: [PATCH] Bug 211522 fix NPEs. --- .../core/settings/model/CProjectDescriptionManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java index ee885b35eb3..2c5cccb337d 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java @@ -2713,8 +2713,11 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { generateCElementDeltasFromLanguageDelta(el, ld, list); } else { if(newRcDes.getType() == ICSettingBase.SETTING_FOLDER){ - ICFolderDescription oldFoDes = oldRcDes.getType() == ICSettingBase.SETTING_FOLDER ? - (ICFolderDescription)oldRcDes : null; + ICFolderDescription oldFoDes = null; + if (oldRcDes != null) { + if (oldRcDes.getType() == ICSettingBase.SETTING_FOLDER) + oldFoDes = (ICFolderDescription)oldRcDes; + } ICDescriptionDelta folderDelta = createDelta((ICFolderDescription)newRcDes, oldFoDes); if(folderDelta != null){ ICDescriptionDelta children[] = folderDelta.getChildren(); @@ -3306,7 +3309,7 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { return null; ICResourceDescription rcDes = cfgDes.getResourceDescription(path, false); - if(!ignoreExcludeStatus && rcDes.isExcluded()) + if(rcDes == null || (!ignoreExcludeStatus && rcDes.isExcluded())) return null; if(rcDes.getType() == ICSettingBase.SETTING_FOLDER){