X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fbackup%2FOsCallBackup.java;h=ad8ffe86118b8cfe848029eef3d9d8db8bc00fc4;hb=85688af22a77f82e7762e11e6eb38c6367eddb6c;hp=e588a0b2e7882aa307c1dbe82a60497b46f55977;hpb=0a63088e055dcd5ff397ce4e98d008c62c84dc98;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/backup/OsCallBackup.java b/org.argeo.cms/src/org/argeo/cms/internal/backup/OsCallBackup.java index e588a0b2e..ad8ffe861 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/backup/OsCallBackup.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/backup/OsCallBackup.java @@ -30,7 +30,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs2.FileContent; import org.apache.commons.vfs2.FileObject; -import org.argeo.ArgeoException; +import org.argeo.cms.CmsException; /** * Runs an OS command and save its standard output as a file. Typically used for @@ -81,20 +81,17 @@ public class OsCallBackup extends AbstractAtomicBackup { // stdout FileContent targetContent = targetFo.getContent(); // stderr - ExecuteStreamHandler streamHandler = new PumpStreamHandler( - targetContent.getOutputStream(), errBos); + ExecuteStreamHandler streamHandler = new PumpStreamHandler(targetContent.getOutputStream(), errBos); executor.setStreamHandler(streamHandler); executor.execute(commandLine, environment); } catch (ExecuteException e) { byte[] err = errBos.toByteArray(); String errStr = new String(err); - throw new ArgeoException("Process " + commandLine + " failed (" - + e.getExitValue() + "): " + errStr, e); + throw new CmsException("Process " + commandLine + " failed (" + e.getExitValue() + "): " + errStr, e); } catch (Exception e) { byte[] err = errBos.toByteArray(); String errStr = new String(err); - throw new ArgeoException("Process " + commandLine + " failed: " - + errStr, e); + throw new CmsException("Process " + commandLine + " failed: " + errStr, e); } finally { IOUtils.closeQuietly(errBos); }