Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 427306
Collapse All | Expand All

(-)a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java (-4 / +10 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2006, 2012 IBM Corporation and others.
2
 * Copyright (c) 2006, 2014 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 68-73 Link Here
68
 * David McKnight   (IBM)        - [390037] [dstore] Duplicated items in the System view
68
 * David McKnight   (IBM)        - [390037] [dstore] Duplicated items in the System view
69
 * David McKnight   (IBM)        - [391164] [dstore] don't clear cached elements when they're not spirited or deleted
69
 * David McKnight   (IBM)        - [391164] [dstore] don't clear cached elements when they're not spirited or deleted
70
 * David McKnight   (IBM)        - [396783] [dstore] fix issues with the spiriting mechanism and other memory improvements (phase 2)
70
 * David McKnight   (IBM)        - [396783] [dstore] fix issues with the spiriting mechanism and other memory improvements (phase 2)
71
 * David McKnight   (IBM)        - [427306] A couple cases where RSE doesn't indicate lack of space for upload
71
 *******************************************************************************/
72
 *******************************************************************************/
72
73
73
package org.eclipse.rse.internal.services.dstore.files;
74
package org.eclipse.rse.internal.services.dstore.files;
Lines 643-648 Link Here
643
						});
644
						});
644
					monitor.subTask(str);
645
					monitor.subTask(str);
645
					isCancelled = monitor.isCanceled();
646
					isCancelled = monitor.isCanceled();
647
					
648
					String resultStr = result.getSource();
649
					if (resultStr.equals("failed")){ //$NON-NLS-1$
650
		    			String msgTxt = NLS.bind(ServiceResources.FILEMSG_COPY_FILE_FAILED, remotePath);
651
		    			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt);
652
		    			throw new SystemMessageException(msg);
653
					}
646
				}
654
				}
647
655
648
				available = bufInputStream.available();
656
				available = bufInputStream.available();
Lines 694-700 Link Here
694
//				UniversalSystemPlugin.logError(CLASSNAME + "." + "copy: " + "error writing file " + remotePath, e);
702
//				UniversalSystemPlugin.logError(CLASSNAME + "." + "copy: " + "error writing file " + remotePath, e);
695
				throw new RemoteFileIOException(e);
703
				throw new RemoteFileIOException(e);
696
			}
704
			}
697
705
		}
698
			if (isCancelled)
706
			if (isCancelled)
699
			{
707
			{
700
				throw new SystemOperationCancelledException();
708
				throw new SystemOperationCancelledException();
Lines 731-739 Link Here
731
			    			throw new SystemMessageException(msg);
739
			    			throw new SystemMessageException(msg);
732
			    		}
740
			    		}
733
			    	}
741
			    	}
734
			    	
735
742
736
			    }
737
			}
743
			}
738
		}
744
		}
739
	}
745
	}
(-)a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java (+7 lines)
Lines 55-60 Link Here
55
 * Samuel Wu		(IBM)		 - [395981] Local file encoding is not handled properly 
55
 * Samuel Wu		(IBM)		 - [395981] Local file encoding is not handled properly 
56
 * David McKnight   (IBM)        - [422508] Unable to map A:\ and B:\ as selectable drives in RSE View
56
 * David McKnight   (IBM)        - [422508] Unable to map A:\ and B:\ as selectable drives in RSE View
57
 * David McKnight   (IBM)        - [420798] Slow performances in RDz 9.0 with opening 7000 files located on a network driver.
57
 * David McKnight   (IBM)        - [420798] Slow performances in RDz 9.0 with opening 7000 files located on a network driver.
58
 * David McKnight   (IBM)        - [427306] A couple cases where RSE doesn't indicate lack of space for upload
58
 *******************************************************************************/
59
 *******************************************************************************/
59
60
60
package org.eclipse.rse.internal.services.local.files;
61
package org.eclipse.rse.internal.services.local.files;
Lines 676-687 Link Here
676
		}
677
		}
677
		catch (FileNotFoundException e)
678
		catch (FileNotFoundException e)
678
		{
679
		{
680
			destinationFile.delete();
681
			throw new RemoteFileIOException(e);
679
		}
682
		}
680
		catch (UnsupportedEncodingException e)
683
		catch (UnsupportedEncodingException e)
681
		{
684
		{
685
			destinationFile.delete();
686
			throw new RemoteFileIOException(e);
682
		}
687
		}
683
		catch (IOException e)
688
		catch (IOException e)
684
		{
689
		{
690
			destinationFile.delete();
691
			throw new RemoteFileIOException(e);
685
		}
692
		}
686
		finally
693
		finally
687
		{
694
		{

Return to bug 427306