Merge branch 'STORM-3249' of https://github.com/revans2/incubator-storm into STORM-3249
STORM-3249: Make sure times shut down and so does shut down thread This closes #2867 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/22440747 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/22440747 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/22440747 Branch: refs/heads/master Commit: 22440747aa0f2ed3f3d26baec9140f79bb82f644 Parents: a0f3b1a bbfd7cd Author: Robert Evans <ev...@yahoo-inc.com> Authored: Tue Oct 9 14:35:30 2018 -0500 Committer: Robert Evans <ev...@yahoo-inc.com> Committed: Tue Oct 9 14:35:30 2018 -0500 ---------------------------------------------------------------------- .../org/apache/storm/hdfs/spout/HdfsSpout.java | 2 +- .../org/apache/storm/hive/bolt/HiveBolt.java | 5 ++- .../apache/storm/hive/trident/HiveState.java | 3 +- .../src/jvm/org/apache/storm/utils/Utils.java | 43 ++++++++++++-------- .../storm/blobstore/LocalFsBlobStore.java | 5 ++- .../java/org/apache/storm/daemon/drpc/DRPC.java | 6 +-- 6 files changed, 40 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
