Repository: camel Updated Branches: refs/heads/camel-2.14.x 0231cdc24 -> 0462bc13e refs/heads/master 55cc138ae -> 4283b0598
CAMEL-8241: Work around bug in commons-exec to get camel-exec to work on unix with java 8. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4283b059 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4283b059 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4283b059 Branch: refs/heads/master Commit: 4283b05984ff7d6ca1dfc7e0103f950a4eb144c6 Parents: 55cc138 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Feb 22 11:54:32 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Feb 22 11:54:32 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/component/exec/ExecProducer.java | 3 ++- .../camel/component/exec/impl/DefaultExecCommandExecutor.java | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4283b059/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecProducer.java b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecProducer.java index 49e1457..04b3917 100644 --- a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecProducer.java +++ b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecProducer.java @@ -45,7 +45,8 @@ public class ExecProducer extends DefaultProducer { ExecCommandExecutor executor = endpoint.getCommandExecutor(); if (executor == null) { - executor = new DefaultExecCommandExecutor(exchange); + // create a new non-shared executor + executor = new DefaultExecCommandExecutor(); } log.info("Executing {}", execCommand); http://git-wip-us.apache.org/repos/asf/camel/blob/4283b059/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java ---------------------------------------------------------------------- diff --git a/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java b/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java index 33cf6a2..4ca391d 100644 --- a/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java +++ b/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java @@ -51,12 +51,6 @@ public class DefaultExecCommandExecutor implements ExecCommandExecutor { private static final Logger LOG = LoggerFactory.getLogger(DefaultExecCommandExecutor.class); - private final Exchange exchange; - - public DefaultExecCommandExecutor(Exchange exchange) { - this.exchange = exchange; - } - public ExecResult execute(ExecCommand command) { notNull(command, "command");