From 172ea442adf543118c9e02babfe64e116feb8f17 Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev <angvoz.dev@gmail.com>
Date: Fri, 1 Jan 2010 18:22:30 +0000
Subject: [PATCH] bug 298590: Restore Defaults does not quite restore Folder
 Settings Restoring original logic of finding parent folder settings from
 revisions earlier than 1.65

---
 .../model/CProjectDescriptionManager.java       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 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 4bafdc4a7ab..ff43d6fc7c8 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
@@ -2505,14 +2505,15 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager {
 				for(parent = child.getParentContainer();
 					(parentRcData = (CResourceData)parent.getValue()).getType() != ICSettingBase.SETTING_FOLDER;
 					parent = parent.getParentContainer()) {
-					if(!settingsCustomized(project, (CFolderData)parentRcData, (CFolderData)childRcData)){
-						try {
-							data.removeResourceData(childRcData);
-							child.remove();
-							modified = true;
-						} catch (CoreException e) {
-							CCorePlugin.log(e);
-						}
+					// no body, this loop is to find the parent
+				}
+				if(!settingsCustomized(project, (CFolderData)parentRcData, (CFolderData)childRcData)){
+					try {
+						data.removeResourceData(childRcData);
+						child.remove();
+						modified = true;
+					} catch (CoreException e) {
+						CCorePlugin.log(e);
 					}
 				}
 			} else {