Attachment 75984 Details for Bug 191548 – Fix for backwards compatibility

[patch] Fix for backwards compatibility

patch.txt (text/plain), 2.90 KB, created by Kevin Doyle

on 2007-08-13 14:11:08 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Doyle

Created: 2007-08-13 14:11:08 EDT

Size: 2.90 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.services.dstore
>Index: miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java,v
>retrieving revision 1.21
>diff -u -r1.21 UniversalFileSystemMiner.java
>--- miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java	11 Aug 2007 03:26:56 -0000	1.21
>+++ miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java	13 Aug 2007 18:04:25 -0000
>@@ -2123,7 +2123,7 @@
> 					.getRegisteredHandler(new File(vpath
> 							.getContainingArchiveString()));
> 			if (handler == null || !handler.delete(vpath.getVirtualPart())) {
>-				status.setAttribute(DE.A_SOURCE, IServiceConstants.FAILED);
>+				status.setAttribute(DE.A_SOURCE, IServiceConstants.FAILED + "|" + vpath.toString()); //$NON-NLS-1$
> 				_dataStore.refresh(subject);
> 				return statusDone(status);
> 			}
>Index: src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java,v
>retrieving revision 1.16
>diff -u -r1.16 DStoreFileService.java
>--- src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java	11 Aug 2007 03:26:56 -0000	1.16
>+++ src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java	13 Aug 2007 18:04:25 -0000
>@@ -929,7 +929,8 @@
> 		DataElement de = getElementFor(remotePath);
> 		DataElement status = dsStatusCommand(de, IUniversalDataStoreConstants.C_DELETE, monitor);
> 		if (status == null) return false;
>-		if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) {
>+		String sourceMsg = FileSystemMessageUtil.getSourceMessage(status);
>+		if (sourceMsg.equals(IServiceConstants.SUCCESS) || sourceMsg.equals("")) { //$NON-NLS-1$
> 			return true;
> 		} else {
> 			throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status)));	 //$NON-NLS-1$
>@@ -949,7 +950,8 @@
> 		}	
> 		DataElement status = dsStatusCommand((DataElement) dataElements.get(0), dataElements, IUniversalDataStoreConstants.C_DELETE_BATCH, monitor);
> 		if (status == null) return false;
>-		if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) {
>+		String sourceMsg = FileSystemMessageUtil.getSourceMessage(status);
>+		if (sourceMsg.equals(IServiceConstants.SUCCESS) || sourceMsg.equals("")) { //$NON-NLS-1$
> 			return true;
> 		} else {
> 			throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status)));	 //$NON-NLS-1$

Actions: View | Diff

Attachments on bug 191548: 75878 | 75984 | 76123 | 76331