You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/04/24 15:45:34 UTC
[7/9] storm git commit: Add null check on throwable before calling
unwantedExceptionHandler
Add null check on throwable before calling unwantedExceptionHandler
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/849315b4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/849315b4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/849315b4
Branch: refs/heads/master
Commit: 849315b495c3dce44f2fca584bb47db69890cf48
Parents: 85b87d9
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Wed Apr 22 18:27:08 2015 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Wed Apr 22 18:27:08 2015 +0000
----------------------------------------------------------------------
.../src/jvm/backtype/storm/utils/ExtendedThreadPoolExecutor.java | 4 +++-
storm-core/src/jvm/backtype/storm/utils/Utils.java | 2 --
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/849315b4/storm-core/src/jvm/backtype/storm/utils/ExtendedThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/ExtendedThreadPoolExecutor.java b/storm-core/src/jvm/backtype/storm/utils/ExtendedThreadPoolExecutor.java
index ec2af1b..4614366 100644
--- a/storm-core/src/jvm/backtype/storm/utils/ExtendedThreadPoolExecutor.java
+++ b/storm-core/src/jvm/backtype/storm/utils/ExtendedThreadPoolExecutor.java
@@ -60,6 +60,8 @@ public class ExtendedThreadPoolExecutor extends ThreadPoolExecutor{
Thread.currentThread().interrupt();
}
}
- Utils.handleUncaughtException(t);
+ if (t != null) {
+ Utils.handleUncaughtException(t);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/849315b4/storm-core/src/jvm/backtype/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/Utils.java b/storm-core/src/jvm/backtype/storm/utils/Utils.java
index 47eba55..b804518 100644
--- a/storm-core/src/jvm/backtype/storm/utils/Utils.java
+++ b/storm-core/src/jvm/backtype/storm/utils/Utils.java
@@ -547,8 +547,6 @@ public class Utils {
//Running in daemon mode, we would pass Error to calling thread.
throw (Error) t;
}
- } else {
- LOG.error("Thread threw an Exception.", t);
}
}
}