You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/02/24 07:57:51 UTC

[1/2] camel git commit: CAMEL-8241: Do not use java8 api only, so it works on java7 also.

Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x a768721b3 -> fc9c43af2
  refs/heads/master 347e3a8d2 -> ab54e347b


CAMEL-8241: Do not use java8 api only, so it works on java7 also.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc9c43af
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc9c43af
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc9c43af

Branch: refs/heads/camel-2.14.x
Commit: fc9c43af2af5ded7eb1060b083edee07ac2cc361
Parents: a768721
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Feb 24 07:58:14 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 24 07:58:14 2015 +0100

----------------------------------------------------------------------
 .../org/apache/camel/component/exec/ExecDefaultExecutor.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/fc9c43af/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecDefaultExecutor.java
----------------------------------------------------------------------
diff --git a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecDefaultExecutor.java b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecDefaultExecutor.java
index 753af19..e76a406 100644
--- a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecDefaultExecutor.java
+++ b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecDefaultExecutor.java
@@ -37,8 +37,12 @@ public class ExecDefaultExecutor extends DefaultExecutor {
     }
 
     public int getExitValue() {
-        if (process != null && !process.isAlive())  {
-            return process.exitValue();
+        if (process != null)  {
+            try {
+                return process.exitValue();
+            } catch (IllegalThreadStateException e) {
+                // ignore the process is alive
+            }
         }
         return 0;
     }


[2/2] camel git commit: CAMEL-8241: Do not use java8 api only, so it works on java7 also.

Posted by da...@apache.org.
CAMEL-8241: Do not use java8 api only, so it works on java7 also.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ab54e347
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ab54e347
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ab54e347

Branch: refs/heads/master
Commit: ab54e347b6f8038a2d0d4ca052d8e984e3b36cb5
Parents: 347e3a8
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Feb 24 07:58:14 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Feb 24 07:58:43 2015 +0100

----------------------------------------------------------------------
 .../org/apache/camel/component/exec/ExecDefaultExecutor.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ab54e347/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecDefaultExecutor.java
----------------------------------------------------------------------
diff --git a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecDefaultExecutor.java b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecDefaultExecutor.java
index 14df04e..8fa534c 100644
--- a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecDefaultExecutor.java
+++ b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecDefaultExecutor.java
@@ -37,8 +37,12 @@ public class ExecDefaultExecutor extends DefaultExecutor {
     }
 
     public int getExitValue() {
-        if (process != null && !process.isAlive())  {
-            return process.exitValue();
+        if (process != null)  {
+            try {
+                return process.exitValue();
+            } catch (IllegalThreadStateException e) {
+                // ignore the process is alive
+            }
         }
         return 0;
     }