brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [02/18] brooklyn-server git commit: better error for scripting
Date Fri, 04 Mar 2016 16:15:47 GMT
better error for scripting


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/437c9bfe
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/437c9bfe
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/437c9bfe

Branch: refs/heads/master
Commit: 437c9bfe3ce5fd7af897357ca37d164552e67713
Parents: d319f7f
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Tue Feb 23 19:21:01 2016 -0800
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Tue Feb 23 19:34:01 2016 -0800

----------------------------------------------------------------------
 .../brooklyn/entity/software/base/lifecycle/ScriptHelper.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/437c9bfe/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
index 27d94cf..a3e3d2b 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
@@ -425,11 +425,11 @@ public class ScriptHelper {
     }
     
     public String getResultStdout() {
-        if (stdout==null) throw new IllegalStateException("output not available on "+this+";
ensure gatherOutput(true) is set");
+        if (stdout==null) throw new IllegalStateException("stdour not available on "+this+";
ensure task has completed and gatherOutput(true) is set");
         return stdout.toString();
     }
     public String getResultStderr() {
-        if (stderr==null) throw new IllegalStateException("output not available on "+this+";
ensure gatherOutput(true) is set");
+        if (stderr==null) throw new IllegalStateException("stderr not available on "+this+";
ensure task has completed and gatherOutput(true) is set");
         return stderr.toString();
     }
 


Mime
View raw message