mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 11:55:40 +02:00
Code Issues Wiki Activity

Bug 348569 - Ever growing resource tree with cyclic symbolic links

Browse source
This commit is contained in:
Anton Leherbauer 2011-06-30 10:01:54 +02:00
parent 6eff5311d7
commit a9f41ac547
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2010 Broadcom Corporation and others. * Copyright (c) 2010, 2011 Broadcom Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* James Blackburn (Broadcom Corp) - initial API and implementation * James Blackburn (Broadcom Corp) - initial API and implementation
* Wind River Systems - Bug 348569
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.core.model.tests; package org.eclipse.cdt.core.model.tests;
@ -57,7 +58,7 @@ public class Bug311189 extends BaseTestCase {
final IPathEntry sourceEntry = new SourceEntry(srcFolder.getFullPath(), new IPath[0]); final IPathEntry sourceEntry = new SourceEntry(srcFolder.getFullPath(), new IPath[0]);
// create a source folder and set it as a source entry // create a source folder and set it as a source entry
srcFolder.create(true, false, null); srcFolder.create(true, true, null);
CoreModel.setRawPathEntries(CoreModel.getDefault().create(project), new IPathEntry[] {sourceEntry}, null); CoreModel.setRawPathEntries(CoreModel.getDefault().create(project), new IPathEntry[] {sourceEntry}, null);
IPathEntry[] rawEntries = CoreModel.getPathEntryStore(project).getRawPathEntries(); IPathEntry[] rawEntries = CoreModel.getPathEntryStore(project).getRawPathEntries();
assertTrue ("Path entry unset!", Arrays.asList(rawEntries).contains(sourceEntry)); assertTrue ("Path entry unset!", Arrays.asList(rawEntries).contains(sourceEntry));
@ -69,7 +70,7 @@ public class Bug311189 extends BaseTestCase {
Job.getJobManager().beginRule(project, null); Job.getJobManager().beginRule(project, null);
// Delete the source folder, and re-recreate it // Delete the source folder, and re-recreate it
srcFolder.delete(true, null); srcFolder.delete(true, null);
srcFolder.create(true, false, null); srcFolder.create(true, true, null);
} finally { } finally {
Job.getJobManager().endRule(project); Job.getJobManager().endRule(project);
} }

14
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ResourceChangeHandler.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007, 2010 Intel Corporation and others. * Copyright (c) 2007, 2011 Intel Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -8,9 +8,11 @@
* Contributors: * Contributors:
* Intel Corporation - Initial API and implementation * Intel Corporation - Initial API and implementation
* Broadcom Corporation - Bug 311189 and clean-up * Broadcom Corporation - Bug 311189 and clean-up
* Wind River Systems - Bug 348569
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.settings.model; package org.eclipse.cdt.internal.core.settings.model;
import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -30,6 +32,7 @@ import org.eclipse.cdt.core.settings.model.ICSourceEntry;
import org.eclipse.cdt.core.settings.model.WriteAccessException; import org.eclipse.cdt.core.settings.model.WriteAccessException;
import org.eclipse.cdt.core.settings.model.util.CDataUtil; import org.eclipse.cdt.core.settings.model.util.CDataUtil;
import org.eclipse.cdt.core.settings.model.util.ResourceChangeHandlerBase; import org.eclipse.cdt.core.settings.model.util.ResourceChangeHandlerBase;
import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
@ -204,11 +207,14 @@ public class ResourceChangeHandler extends ResourceChangeHandlerBase implements
// Bug 311189 -- if the resource still exists now, don't treat as a remove! // Bug 311189 -- if the resource still exists now, don't treat as a remove!
if (to == null) { if (to == null) {
// Workaround for platform Bug 317783
if (from.getWorkspace().validateFiltered(from).isOK())
from.refreshLocal(IResource.DEPTH_ZERO, null);
if (from.exists()) if (from.exists())
continue; continue;
// Workaround for platform Bug 317783
if (from.getWorkspace().validateFiltered(from).isOK()) {
URI uri = from.getLocationURI();
if (uri != null && EFS.getStore(uri).fetchInfo().exists())
continue;
}
} }
ICProjectDescription prjDesc = getProjectDescription(from); ICProjectDescription prjDesc = getProjectDescription(from);