From f5ddcb1de96dac8e0cd9c838206869f60e712ace Mon Sep 17 00:00:00 2001
From: Mikhail Sennikovsky <mikhail.sennikovskiy@gmail.com>
Date: Fri, 4 May 2007 11:12:32 +0000
Subject: [PATCH] Fix for [Bug 185497] NPE in
 org.eclipse.cdt.managedbuilder.internal.core.FolderInfo

---
 .../core/settings/model/CProjectDescriptionManager.java         | 2 ++
 1 file changed, 2 insertions(+)

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 a7623bf1f87..070b88db7d0 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
@@ -3203,6 +3203,7 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager {
 				if(!settingsCustomized(project, (CFolderData)parentRcData, (CFolderData)childRcData)){
 					try {
 						data.removeResourceData(childRcData);
+						child.remove();
 						modified = true;
 					} catch (CoreException e) {
 						CCorePlugin.log(e);
@@ -3213,6 +3214,7 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager {
 				if(!settingsCustomized(project, (CResourceData)parent.getValue(), (CFileData)childRcData)){
 					try {
 						data.removeResourceData(childRcData);
+						child.remove();
 						modified = true;
 					} catch (CoreException e) {
 						CCorePlugin.log(e);