From 7b48b49495248f54f697a0e863fc51238d0a7ecc Mon Sep 17 00:00:00 2001 From: David McKnight Date: Mon, 11 Sep 2006 16:39:52 +0000 Subject: [PATCH] fix for 153638 --- .../miners/filesystem/UniversalFileSystemMiner.java | 12 ++++++++++-- .../rse/services/dstore/files/DStoreFileService.java | 5 +++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java index 44fc57e9bf0..19dc3a64106 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java @@ -1127,13 +1127,21 @@ private DataElement createDataElementFromLSString(DataElement subject, private DataElement handleDeleteBatch(DataElement theElement, DataElement status) { + DataElement substatus = _dataStore.createObject(null, "status", "substatus"); int numOfSources = theElement.getNestedSize() - 2; for (int i = 0; i < numOfSources; i++) { DataElement subject = getCommandArgument(theElement, i+1); - handleDelete(subject, status, false); - if (!status.getSource().startsWith(SUCCESS)) return statusDone(status); + handleDelete(subject, substatus, false); + /* + if (!substatus.getSource().startsWith(SUCCESS)) + { + status.setAttribute(DE.A_SOURCE, substatus.getSource()); + return statusDone(status); + } + */ } + status.setAttribute(DE.A_SOURCE, substatus.getSource()); return statusDone(status); } diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java index 18af93b5f81..800b8d6fae6 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java @@ -900,8 +900,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer } DataElement status = dsStatusCommand(monitor, (DataElement) dataElements.get(0), dataElements, C_DELETE_BATCH); if (status == null) return false; - if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) return true; - else throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status))); + if (FileSystemMessageUtil.getSourceMessage(status).startsWith(IServiceConstants.FAILED)) + throw new SystemMessageException(getMessage("RSEF1300").makeSubstitution(FileSystemMessageUtil.getSourceLocation(status))); + else return true; } public boolean rename(IProgressMonitor monitor, String remoteParent, String oldName, String newName) throws SystemMessageException