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 2016/02/19 15:54:41 UTC
[05/10] storm git commit: make EventManager extend AutoClosable
make EventManager extend AutoClosable
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/370daf72
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/370daf72
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/370daf72
Branch: refs/heads/master
Commit: 370daf72d9346f13940c104a7de7af0241dc699d
Parents: 98fb253
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Fri Feb 19 10:17:34 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Fri Feb 19 10:17:34 2016 +0800
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/event/EventManager.java | 4 +---
.../jvm/org/apache/storm/event/EventManagerImp.java | 13 +++++--------
2 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/370daf72/storm-core/src/jvm/org/apache/storm/event/EventManager.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/event/EventManager.java b/storm-core/src/jvm/org/apache/storm/event/EventManager.java
index b1c265a..64536c1 100644
--- a/storm-core/src/jvm/org/apache/storm/event/EventManager.java
+++ b/storm-core/src/jvm/org/apache/storm/event/EventManager.java
@@ -17,10 +17,8 @@
*/
package org.apache.storm.event;
-public interface EventManager {
+public interface EventManager extends AutoCloseable {
void add(Runnable eventFn);
boolean waiting();
-
- void shutdown();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/370daf72/storm-core/src/jvm/org/apache/storm/event/EventManagerImp.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/event/EventManagerImp.java b/storm-core/src/jvm/org/apache/storm/event/EventManagerImp.java
index 1c63ddc..42e6d6b 100644
--- a/storm-core/src/jvm/org/apache/storm/event/EventManagerImp.java
+++ b/storm-core/src/jvm/org/apache/storm/event/EventManagerImp.java
@@ -88,13 +88,10 @@ public class EventManagerImp implements EventManager {
return (Time.isThreadWaiting(runner) || (processed.get() == added.get()));
}
- public void shutdown() {
- try {
- running.set(false);
- runner.interrupt();
- runner.join();
- } catch (InterruptedException e) {
- throw Utils.wrapInRuntime(e);
- }
+ @Override
+ public void close() throws Exception {
+ running.set(false);
+ runner.interrupt();
+ runner.join();
}
}