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/24 17:17:15 UTC
[05/27] storm git commit: callback maybe null
callback maybe null
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5916b0b8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5916b0b8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5916b0b8
Branch: refs/heads/master
Commit: 5916b0b8089f9dd184fdd1ab2f18eb5e5deabc65
Parents: 9a79fb7
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Wed Feb 3 21:15:41 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Wed Feb 3 21:15:41 2016 +0800
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/cluster/StormZkClusterState.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5916b0b8/storm-core/src/jvm/org/apache/storm/cluster/StormZkClusterState.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/cluster/StormZkClusterState.java b/storm-core/src/jvm/org/apache/storm/cluster/StormZkClusterState.java
index 3f32fe1..3a4205b 100644
--- a/storm-core/src/jvm/org/apache/storm/cluster/StormZkClusterState.java
+++ b/storm-core/src/jvm/org/apache/storm/cluster/StormZkClusterState.java
@@ -148,12 +148,14 @@ public class StormZkClusterState implements StormClusterState {
protected void issueCallback(AtomicReference<IFn> cb) {
IFn callback = cb.getAndSet(null);
- callback.invoke();
+ if (callback != null)
+ callback.invoke();
}
protected void issueMapCallback(ConcurrentHashMap<String, IFn> callbackConcurrentHashMap, String key) {
IFn callback = callbackConcurrentHashMap.remove(key);
- callback.invoke();
+ if (callback != null)
+ callback.invoke();
}
@Override