diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java index 1eb53531b43..f1408b4dc06 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java @@ -523,6 +523,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi handler.add(file, path, newName, sourceEncoding, targetEncoding, isText, archiveOperationMonitor); } } catch (SystemMessageException e) { + //e.printStackTrace(); if (null != monitor && monitor.isCanceled()) { //This operation has been cancelled by the user. @@ -1192,7 +1193,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi // for 192705, we need to throw an exception when rename fails String msgTxt = NLS.bind(LocalServiceResources.FILEMSG_RENAME_FILE_FAILED, child.fullName); //String msgDetails = LocalServiceResources.FILEMSG_RENAME_FILE_FAILED_DETAILS; - e.printStackTrace(); + //e.printStackTrace(); throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, ILocalMessageIds.FILEMSG_RENAME_FILE_FAILED, IStatus.ERROR, diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java index 8ad7159a1b5..d73fadeb748 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java @@ -1120,6 +1120,7 @@ public class SystemTarHandler implements ISystemArchiveHandler { if (exists(fullVirtualName, archiveOperationMonitor)) { replace(fullVirtualName, file, name, archiveOperationMonitor); setArchiveOperationMonitorStatusDone(archiveOperationMonitor); + return; } else { File[] files = new File[1]; @@ -1128,6 +1129,7 @@ public class SystemTarHandler implements ISystemArchiveHandler { names[0] = name; add(files, virtualPath, names, archiveOperationMonitor); setArchiveOperationMonitorStatusDone(archiveOperationMonitor); + return; } } else { @@ -1157,6 +1159,7 @@ public class SystemTarHandler implements ISystemArchiveHandler { add(sources, virtualPath, newNames, archiveOperationMonitor); setArchiveOperationMonitorStatusDone(archiveOperationMonitor); + return; } } } @@ -1228,6 +1231,7 @@ public class SystemTarHandler implements ISystemArchiveHandler { replace(fullVirtualName, files[i], names[i], archiveOperationMonitor); setArchiveOperationMonitorStatusDone(archiveOperationMonitor); + return; } } @@ -1670,6 +1674,7 @@ public class SystemTarHandler implements ISystemArchiveHandler { // if the virtual file does not exist, we actually want to add if (!exists(fullVirtualName, archiveOperationMonitor)) { add(file, fullVirtualName, name, archiveOperationMonitor); + return; } try {