mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-09 10:05:24 +02:00
Code Issues Wiki Activity

Fix 162962 - "duplicate name collision" when copying directory by improving RemoteFileSubSystem.removeCachedRemoteFile() such that when a file is removed, all its children are also removed from the cache.

Browse source
This commit is contained in:
Martin Oberhuber 2006-11-02 16:17:24 +00:00
parent cbfe5a4281
commit 1a713cc7e9
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2006 IBM Corporation. All rights reserved. * Copyright (c) 2006 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -12,6 +12,7 @@
* *
* Contributors: * Contributors:
* Martin Oberhuber (Wind River) - Fix 158534 - NPE in upload/download after conflict * Martin Oberhuber (Wind River) - Fix 158534 - NPE in upload/download after conflict
* Martin Oberhuber (Wind River) - Fix 162962 - recursive removeCachedRemoteFile()
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.subsystems.files.core.servicesubsystem; package org.eclipse.rse.subsystems.files.core.servicesubsystem;
@ -700,6 +701,8 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
parents[i] = folderOrFiles[i].getParentPath(); parents[i] = folderOrFiles[i].getParentPath();
names[i] = folderOrFiles[i].getName(); names[i] = folderOrFiles[i].getName();
folderOrFiles[i].markStale(true); folderOrFiles[i].markStale(true);
//bug 162962: need to recursively remove children from cache
removeCachedRemoteFile(folderOrFiles[i]);
} }
IFileService service = getFileService(); IFileService service = getFileService();
try try

20
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java
View file

@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. * Copyright (c) 2002, 2006 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
@ -11,7 +11,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - Fix 162962 - recursive removeCachedRemoteFile()
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.subsystems.files.core.subsystems; package org.eclipse.rse.subsystems.files.core.subsystems;
@ -28,6 +28,7 @@ import java.net.UnknownHostException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
@ -1624,6 +1625,21 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
} }
} }
} }
//Workaround for bug 162962: getContents() incomplete, children not deleted
//If getContents() is implemented correctly, no matches should be removed
String prefix = file.getAbsolutePath() + file.getSeparator();
//Clone the hashMap in order to avoid ConcurrentModificationException in the iterator
HashMap tmpMap = (HashMap)_cachedRemoteFiles.clone();
Iterator it = tmpMap.keySet().iterator();
while (it.hasNext()) {
String remotePath = (String)it.next();
if (remotePath.startsWith(prefix)) {
//FIXME this should never be called if getContents() is implemented correctly
//such that children are already removed in the code above.
removeCachedRemoteFile(remotePath);
}
}
} }
_cachedRemoteFiles.remove(file.getAbsolutePath()); _cachedRemoteFiles.remove(file.getAbsolutePath());
} }