You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/12/18 20:04:08 UTC
[1/4] storm git commit: adds null check before trying to remove
connections
Repository: storm
Updated Branches:
refs/heads/master 418792f84 -> e859cf4ca
adds null check before trying to remove connections
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6281ba82
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6281ba82
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6281ba82
Branch: refs/heads/master
Commit: 6281ba82c8133bdfeb4ed2f52eb540e5d103e331
Parents: 4e0694b
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Dec 17 12:38:52 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Dec 17 12:38:52 2015 -0600
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/messaging/netty/Context.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6281ba82/storm-core/src/jvm/backtype/storm/messaging/netty/Context.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/Context.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Context.java
index bc978b6..14dfd9e 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/Context.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Context.java
@@ -85,7 +85,9 @@ public class Context implements IContext {
}
synchronized void removeClient(String host, int port) {
- connections.remove(key(host, port));
+ if (connections != null) {
+ connections.remove(key(host, port));
+ }
}
/**
[2/4] storm git commit: Merge branch
'storm-1400-null-check-netty-ctx' of https://github.com/d2r/storm into
STORM-1400-merge
Posted by da...@apache.org.
Merge branch 'storm-1400-null-check-netty-ctx' of https://github.com/d2r/storm into STORM-1400-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6b133e97
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6b133e97
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6b133e97
Branch: refs/heads/master
Commit: 6b133e975eb5411594614a2c6432b782cbc47e0d
Parents: 418792f 6281ba8
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Fri Dec 18 12:48:02 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Fri Dec 18 12:48:02 2015 -0600
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/messaging/netty/Context.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[4/4] storm git commit: Merge branch 'STORM-1400-merge'
Posted by da...@apache.org.
Merge branch 'STORM-1400-merge'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e859cf4c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e859cf4c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e859cf4c
Branch: refs/heads/master
Commit: e859cf4ca0842c8dd18bf11ef90c48cd3f30d708
Parents: 418792f ee0b92d
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Fri Dec 18 13:03:30 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Fri Dec 18 13:03:30 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
storm-core/src/jvm/backtype/storm/messaging/netty/Context.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/4] storm git commit: adds STORM-1400
Posted by da...@apache.org.
adds STORM-1400
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ee0b92d1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ee0b92d1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ee0b92d1
Branch: refs/heads/master
Commit: ee0b92d1e9ccbc9f09545073171ed6942dcd0d26
Parents: 6b133e9
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Fri Dec 18 12:48:40 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Fri Dec 18 12:48:40 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ee0b92d1/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51c62bf..0323646 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1400: Netty Context removeClient() called after term() causes NullPointerException.
* STORM-1383: Supervisors should not crash if nimbus is unavailable
* STORM-1381: Client side topology submission hook.
* STORM-1376: Performance slowdown due excessive zk connections and log-debugging