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

[427306] A couple cases where RSE doesn't indicate lack of space for

Browse source 
upload
This commit is contained in:
Dave McKnight 2014-02-03 13:31:33 -05:00
parent 3d3a70eb74
commit ec512b8912
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2006, 2012 IBM Corporation and others. * Copyright (c) 2006, 2014 IBM 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
@ -68,6 +68,7 @@
* David McKnight (IBM) - [390037] [dstore] Duplicated items in the System view * David McKnight (IBM) - [390037] [dstore] Duplicated items in the System view
* David McKnight (IBM) - [391164] [dstore] don't clear cached elements when they're not spirited or deleted * David McKnight (IBM) - [391164] [dstore] don't clear cached elements when they're not spirited or deleted
* David McKnight (IBM) - [396783] [dstore] fix issues with the spiriting mechanism and other memory improvements (phase 2) * David McKnight (IBM) - [396783] [dstore] fix issues with the spiriting mechanism and other memory improvements (phase 2)
* David McKnight (IBM) - [427306] A couple cases where RSE doesn't indicate lack of space for upload
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.services.dstore.files; package org.eclipse.rse.internal.services.dstore.files;
@ -643,6 +644,13 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
}); });
monitor.subTask(str); monitor.subTask(str);
isCancelled = monitor.isCanceled(); isCancelled = monitor.isCanceled();
String resultStr = result.getSource();
if (resultStr.equals("failed")){ //$NON-NLS-1$
String msgTxt = NLS.bind(ServiceResources.FILEMSG_COPY_FILE_FAILED, remotePath);
SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt);
throw new SystemMessageException(msg);
}
} }
available = bufInputStream.available(); available = bufInputStream.available();
@ -694,7 +702,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
// UniversalSystemPlugin.logError(CLASSNAME + "." + "copy: " + "error writing file " + remotePath, e); // UniversalSystemPlugin.logError(CLASSNAME + "." + "copy: " + "error writing file " + remotePath, e);
throw new RemoteFileIOException(e); throw new RemoteFileIOException(e);
} }
}
if (isCancelled) if (isCancelled)
{ {
throw new SystemOperationCancelledException(); throw new SystemOperationCancelledException();
@ -732,8 +740,6 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
} }
} }
}
} }
} }
} }

7
rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java
View file

@ -55,6 +55,7 @@
* Samuel Wu (IBM) - [395981] Local file encoding is not handled properly * Samuel Wu (IBM) - [395981] Local file encoding is not handled properly
* David McKnight (IBM) - [422508] Unable to map A:\ and B:\ as selectable drives in RSE View * David McKnight (IBM) - [422508] Unable to map A:\ and B:\ as selectable drives in RSE View
* David McKnight (IBM) - [420798] Slow performances in RDz 9.0 with opening 7000 files located on a network driver. * David McKnight (IBM) - [420798] Slow performances in RDz 9.0 with opening 7000 files located on a network driver.
* David McKnight (IBM) - [427306] A couple cases where RSE doesn't indicate lack of space for upload
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.services.local.files; package org.eclipse.rse.internal.services.local.files;
@ -676,12 +677,18 @@ public class LocalFileService extends AbstractFileService implements ILocalServi
} }
catch (FileNotFoundException e) catch (FileNotFoundException e)
{ {
destinationFile.delete();
throw new RemoteFileIOException(e);
} }
catch (UnsupportedEncodingException e) catch (UnsupportedEncodingException e)
{ {
destinationFile.delete();
throw new RemoteFileIOException(e);
} }
catch (IOException e) catch (IOException e)
{ {
destinationFile.delete();
throw new RemoteFileIOException(e);
} }
finally finally
{ {