diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopier.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopier.java index 859c003653c8bb47d4c79a9e66042e3354cf4390..991a096f5f96e106b78e1c5b0cebf9e19053f54a 100644 --- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopier.java +++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopier.java @@ -169,7 +169,7 @@ class MsInjectionCopier implements Serializable, IPostRegistrationDatasetHandler public void deleteFolder(File folder) { ProcessResult result = - executor.tryExecuteCommandRemotely("rm -rf " + folder.getPath(), + executor.executeCommandRemotely("rm -rf " + folder.getPath(), DataSetCopier.SSH_TIMEOUT_MILLIS); if (result.isOK() == false) { @@ -201,7 +201,7 @@ class MsInjectionCopier implements Serializable, IPostRegistrationDatasetHandler public void renameTo(File newFile, File oldFile) { ProcessResult result = - executor.tryExecuteCommandRemotely("mv " + oldFile.getPath() + " " + executor.executeCommandRemotely("mv " + oldFile.getPath() + " " + newFile.getPath(), DataSetCopier.SSH_TIMEOUT_MILLIS); if (result.isOK() == false) { diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopierTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopierTest.java index 6e84591d0f515436181f10ebf74e3831ba7f226b..e1dc456e57f7990d0257060f3392f2f72de542a7 100644 --- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopierTest.java +++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/dss/phosphonetx/server/plugins/MsInjectionCopierTest.java @@ -196,14 +196,14 @@ public class MsInjectionCopierTest extends AbstractFileSystemTestCase one(sshExecutor).exists(copiedDataSet, SSH_TIMEOUT_MILLIS); will(returnValue(BooleanStatus.createTrue())); - one(sshExecutor).tryExecuteCommandRemotely("rm -rf " + copiedDataSet, + one(sshExecutor).executeCommandRemotely("rm -rf " + copiedDataSet, SSH_TIMEOUT_MILLIS); will(returnValue(OK_RESULT)); one(copier).copyToRemote(dataSet, destination, "localhost", null, null); will(returnValue(Status.OK)); - one(sshExecutor).tryExecuteCommandRemotely( + one(sshExecutor).executeCommandRemotely( "mv " + new File(destination, dataSet.getName()) + " " + copiedDataSet, SSH_TIMEOUT_MILLIS); will(returnValue(OK_RESULT));