You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by lo...@apache.org on 2016/02/19 04:11:59 UTC
[3/5] storm git commit: resolve a few very minor style issues
resolve a few very minor style issues
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9635e391
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9635e391
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9635e391
Branch: refs/heads/master
Commit: 9635e391c380ca160cb408e28eb3364b42851a60
Parents: f343b7d
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Wed Feb 17 09:42:15 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Wed Feb 17 09:42:15 2016 +0800
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/command/HealthCheck.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9635e391/storm-core/src/jvm/org/apache/storm/command/HealthCheck.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/command/HealthCheck.java b/storm-core/src/jvm/org/apache/storm/command/HealthCheck.java
index 05890d6..9fe0ed4 100644
--- a/storm-core/src/jvm/org/apache/storm/command/HealthCheck.java
+++ b/storm-core/src/jvm/org/apache/storm/command/HealthCheck.java
@@ -81,22 +81,20 @@ public class HealthCheck {
Thread.sleep(timeout);
curThread.interrupt();
} catch (InterruptedException e) {
-
+ // Ignored
}
}
});
interruptThread.start();
process.waitFor();
interruptThread.interrupt();
+ curThread.interrupted();
if (process.exitValue() != 0) {
String str;
InputStream stdin = process.getInputStream();
BufferedReader reader = new BufferedReader(new InputStreamReader(stdin));
while ((str = reader.readLine()) != null) {
- if (StringUtils.isBlank(str)) {
- continue;
- }
if (str.startsWith("ERROR")) {
return FAILED;
}
@@ -105,7 +103,7 @@ public class HealthCheck {
}
return FAILED_WITH_EXIT_CODE;
} catch (InterruptedException e) {
- System.out.println("Script " + script + "timed out.");
+ System.out.println("Script " + script + " timed out.");
return TIMEOUT;
} catch (Exception e) {
System.out.println("Script failed with exception: " + e);