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

[251429] Pasting local folder to remote does not work in some case

Browse source
This commit is contained in:
David McKnight 2008-10-21 15:25:04 +00:00
parent ceae7726eb
commit 7c2f603436
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java
View file

@ -50,6 +50,7 @@
* David McKnight (IBM) - [240710] [dstore] DStoreFileService.getFile() fails with NPE for valid root files
* David McKnight (IBM) - [249544] Save conflict dialog appears when saving files in the editor
* David McKnight (IBM) - [250168] some backward compatibility issues with old IBM dstore server
* David McKnight (IBM) - [251429] Pasting local folder to remote does not work in some case
*******************************************************************************/
package org.eclipse.rse.internal.services.dstore.files;
@ -1995,10 +1996,25 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
String normalizedPath = PathUtility.normalizeUnknown(path);
DataElement element = (DataElement)_fileElementMap.get(normalizedPath);
if (element != null && element.isDeleted())
if (element != null)
{
_fileElementMap.remove(normalizedPath);
element = null;
if (element.isDeleted()){
_fileElementMap.remove(normalizedPath);
element = null;
}
else {
// make sure the mapping is still correct
// the file could have been renamed before as in bug 251429
String fparent = element.getValue();
StringBuffer pathBuf = new StringBuffer(fparent);
String sep = PathUtility.getSeparator(fparent);
pathBuf.append(sep);
pathBuf.append(element.getName());
if (!normalizedPath.equals(pathBuf.toString())){
_fileElementMap.remove(normalizedPath);
element = null;
}
}
}
if (element == null || element.isDeleted())
{