From 768092e26c5697920e2f4b8465a285fee19bd6aa Mon Sep 17 00:00:00 2001 From: James Blackburn Date: Thu, 18 Mar 2010 16:32:49 +0000 Subject: [PATCH] Bug 302881 Tweak fix; return previous referenced settings if the referenced project's configuration isn't yet accessible. --- .../settings/model/CfgExportSettingContainerFactory.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CfgExportSettingContainerFactory.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CfgExportSettingContainerFactory.java index a41b589951c..52f8271fbf0 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CfgExportSettingContainerFactory.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CfgExportSettingContainerFactory.java @@ -98,12 +98,10 @@ public class CfgExportSettingContainerFactory extends return es; } } - } else { - // If project doesn't not open in this workspace, just return the previous settings - // for the moment. We'll update again when the referenced project reappears - return prevSettings; } - return new CExternalSetting[0]; + // If project not yet accessible, just return the previous settings + // for the moment. We'll update again when the referenced project reappears + return prevSettings; } }