From cd32934c102b9cfa3fb72d4948920d763753f57d Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Mon, 7 Jun 2004 17:19:37 +0000 Subject: [PATCH] Fix for PR 65524 * src/org/eclipse/cdt/core/internal/filetype/ResolverModel.java --- core/org.eclipse.cdt.core/ChangeLog | 5 +++++ .../cdt/core/internal/filetype/ResolverModel.java | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog index 2784d08d783..02b62a512ff 100644 --- a/core/org.eclipse.cdt.core/ChangeLog +++ b/core/org.eclipse.cdt.core/ChangeLog @@ -1,3 +1,8 @@ +2004-06-07 Alain Magloire + + Fix for PR 65524 + * src/org/eclipse/cdt/core/internal/filetype/ResolverModel.java + 2004-06-04 Alain Magloire Potential deadlock in CElement.getElementInfo() diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/internal/filetype/ResolverModel.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/internal/filetype/ResolverModel.java index f28df8b92af..73bfab1389e 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/internal/filetype/ResolverModel.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/internal/filetype/ResolverModel.java @@ -594,12 +594,9 @@ public class ResolverModel implements IResolverModel { return custom.booleanValue(); } - private ICDescriptor getProjectDescriptor(IProject project) { + private ICDescriptor getProjectDescriptor(IProject project) throws CoreException { ICDescriptor descriptor = null; - try { - descriptor = CCorePlugin.getDefault().getCProjectDescription(project); - } catch (CoreException e) { - } + descriptor = CCorePlugin.getDefault().getCProjectDescription(project); return descriptor; } @@ -638,7 +635,7 @@ public class ResolverModel implements IResolverModel { } public void saveProjectResolver(IProject project, ICFileTypeResolver resolver) { - ResolverModel model = ResolverModel.getDefault(); + //ResolverModel model = ResolverModel.getDefault(); Element root = getProjectData(project); Document doc = root.getOwnerDocument(); Node child = root.getFirstChild();