View | Details | Raw Unified | Return to bug 191548 | Differences between
and this patch

Collapse All | Expand All

(-)miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java (-1 / +1 lines)
Lines 2123-2129 Link Here
2123 
					.getRegisteredHandler(new File(vpath
 2123 
					.getRegisteredHandler(new File(vpath
2124 
							.getContainingArchiveString()));
 2124 
							.getContainingArchiveString()));
2125 
			if (handler == null || !handler.delete(vpath.getVirtualPart())) {
 2125 
			if (handler == null || !handler.delete(vpath.getVirtualPart())) {
2126 
				status.setAttribute(DE.A_SOURCE, IServiceConstants.FAILED);
 2126 
				status.setAttribute(DE.A_SOURCE, IServiceConstants.FAILED + "|" + vpath.toString()); //$NON-NLS-1$
2127 
				_dataStore.refresh(subject);
 2127 
				_dataStore.refresh(subject);
2128 
				return statusDone(status);
 2128 
				return statusDone(status);
2129 
			}
 2129 
			}
(-)src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java (-2 / +4 lines)
Lines 929-935 Link Here
929 
		DataElement de = getElementFor(remotePath);
 929 
		DataElement de = getElementFor(remotePath);
930 
		DataElement status = dsStatusCommand(de, IUniversalDataStoreConstants.C_DELETE, monitor);
 930 
		DataElement status = dsStatusCommand(de, IUniversalDataStoreConstants.C_DELETE, monitor);
931 
		if (status == null) return false;
 931 
		if (status == null) return false;
932 
		if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) {
 932 
		String sourceMsg = FileSystemMessageUtil.getSourceMessage(status);
933 
		if (sourceMsg.equals(IServiceConstants.SUCCESS) || sourceMsg.equals("")) { //$NON-NLS-1$
933 
			return true;
 934 
			return true;
934 
		} else {
 935 
		} else {
935 
			throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status)));	 //$NON-NLS-1$
 936 
			throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status)));	 //$NON-NLS-1$
Lines 949-955 Link Here
949 
		}
950 
		}
950 
		DataElement status = dsStatusCommand((DataElement) dataElements.get(0), dataElements, IUniversalDataStoreConstants.C_DELETE_BATCH, monitor);
 951 
		DataElement status = dsStatusCommand((DataElement) dataElements.get(0), dataElements, IUniversalDataStoreConstants.C_DELETE_BATCH, monitor);
951 
		if (status == null) return false;
 952 
		if (status == null) return false;
952 
		if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) {
 953 
		String sourceMsg = FileSystemMessageUtil.getSourceMessage(status);
954 
		if (sourceMsg.equals(IServiceConstants.SUCCESS) || sourceMsg.equals("")) { //$NON-NLS-1$
953 
			return true;
 955 
			return true;
954 
		} else {
 956 
		} else {
955 
			throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status)));	 //$NON-NLS-1$
 957 
			throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status)));	 //$NON-NLS-1$

Return to bug 191548