branch develop updated (b01168d -> 2d2ba7a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from b01168d refs #6054 add more logs for acoustic import new 2d2ba7a fixes #6275: Faire fonctionner la génération des cartes pour l'export Coser The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2d2ba7a666aa94a1f2df69bdc922444eeb874f9f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 15 19:38:51 2014 +0100 fixes #6275: Faire fonctionner la génération des cartes pour l'export Coser Summary of changes: .../src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 2d2ba7a666aa94a1f2df69bdc922444eeb874f9f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 15 19:38:51 2014 +0100 fixes #6275: Faire fonctionner la génération des cartes pour l'export Coser --- .../src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java b/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java index 2c7e8ba..f85c9b1 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/io/CommandLineUtils.java @@ -29,7 +29,6 @@ import org.apache.commons.exec.PumpStreamHandler; import org.apache.commons.logging.Log; import java.io.File; -import java.io.IOException; /** * Utils method around a command line execution. @@ -54,7 +53,7 @@ public class CommandLineUtils { } else { argument = "\"" + arg.toString() + "\""; } - result.addArgument(argument, false); + result.addArgument(argument, true); } } return result; @@ -80,7 +79,7 @@ public class CommandLineUtils { logger.info("Command line '" + commandLine.toString() + "' will be execute"); } exitValue = executor.execute(commandLine); - } catch (IOException eee) { + } catch (Exception eee) { throw new EchoBaseTechnicalException(errorMsg + "\n" + log, eee); } @@ -89,9 +88,9 @@ public class CommandLineUtils { } if (exitValue != 0) { if (logger.isErrorEnabled()) { - logger.error("Command failed:\n"+ log); + logger.error("Command failed:\n" + log); } - throw new EchoBaseTechnicalException(errorMsg + "\n" + log.replaceAll("\\n","<br/>\n")); + throw new EchoBaseTechnicalException(errorMsg + "\n" + log.replaceAll("\\n", "<br/>\n")); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm