You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2015/12/04 13:48:51 UTC
[5/7] incubator-brooklyn git commit: SshAbstractTool.propagate:
rethrow fatal exceptions as-is
SshAbstractTool.propagate: rethrow fatal exceptions as-is
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c51840ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c51840ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c51840ac
Branch: refs/heads/master
Commit: c51840ac4b47ce823629547e3c3e6b5a300f7e15
Parents: 1984eaf
Author: Aled Sage <al...@gmail.com>
Authored: Fri Dec 4 12:01:24 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Dec 4 12:01:24 2015 +0000
----------------------------------------------------------------------
.../apache/brooklyn/util/core/internal/ssh/SshAbstractTool.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c51840ac/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/SshAbstractTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/SshAbstractTool.java b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/SshAbstractTool.java
index 447c723..033e7ea 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/SshAbstractTool.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/SshAbstractTool.java
@@ -26,6 +26,7 @@ import java.io.File;
import java.util.Map;
import java.util.Set;
+import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.os.Os;
import com.google.common.collect.Iterables;
@@ -166,6 +167,7 @@ public abstract class SshAbstractTool extends ShellAbstractTool implements SshTo
}
protected SshException propagate(Exception e, String message) throws SshException {
+ Exceptions.propagateIfFatal(e);
throw new SshException("(" + toString() + ") " + message + ": " + e.getMessage(), e);
}