From 1f89361032478066095609e729ac87bee9df4824 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Thu, 12 Nov 2015 22:45:41 -0500 Subject: [PATCH] Bug 481753 - LanguageSettingsProvidersSerializer does not "Check Out" shared language.settings.xml file before writing to it Change-Id: Ic256e95f17f070c763bdaef8b63583bd915c7eb0 Signed-off-by: Marc-Andre Laperle --- .../settings/providers/LanguageSettingsProvidersSerializer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java index cbb1001c69f..87a0b8bee7f 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java @@ -47,6 +47,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.resources.WorkspaceJob; @@ -879,6 +880,7 @@ public class LanguageSettingsProvidersSerializer { fileStorePrj.delete(true, null); } } else { + project.getWorkspace().validateEdit(new IFile[] { fileStorePrj }, IWorkspace.VALIDATE_PROMPT); IContainer folder = fileStorePrj.getParent(); if (folder instanceof IFolder && !folder.exists()) { ((IFolder) folder).create(true, true, null);