You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/09/21 00:03:01 UTC
[1/4] storm git commit: [STORM-1051] Fix for flushMessagse NPE
Repository: storm
Updated Branches:
refs/heads/0.9.x-branch a58e30cbb -> 2468d830c
[STORM-1051] Fix for flushMessagse NPE
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/aa8114f1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/aa8114f1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/aa8114f1
Branch: refs/heads/0.9.x-branch
Commit: aa8114f15963b80dabaf97466334296ca2b4c51d
Parents: a58e30c
Author: Michael Schonfeld <mi...@schonfeld.org>
Authored: Fri Sep 18 12:31:32 2015 -0400
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Sep 21 07:01:51 2015 +0900
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/messaging/netty/Client.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/aa8114f1/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
index 166c1b2..7f801e5 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
@@ -307,7 +307,7 @@ public class Client extends ConnectionWithStatus implements IStatefulObject {
* If the write operation fails, then we will close the channel and trigger a reconnect.
*/
private void flushMessages(Channel channel, final MessageBatch batch) {
- if(batch.isEmpty()){
+ if(null == batch || batch.isEmpty()){
return;
}
[2/4] storm git commit: match style to the rest of the file
Posted by ka...@apache.org.
match style to the rest of the file
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e6819387
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e6819387
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e6819387
Branch: refs/heads/0.9.x-branch
Commit: e6819387019dca33e8d835a1110ca78fd8d8b672
Parents: aa8114f
Author: Michael Schonfeld <mi...@schonfeld.org>
Authored: Sat Sep 19 01:55:09 2015 -0400
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Sep 21 07:01:55 2015 +0900
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/messaging/netty/Client.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e6819387/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
index 7f801e5..067dddc 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
@@ -307,7 +307,7 @@ public class Client extends ConnectionWithStatus implements IStatefulObject {
* If the write operation fails, then we will close the channel and trigger a reconnect.
*/
private void flushMessages(Channel channel, final MessageBatch batch) {
- if(null == batch || batch.isEmpty()){
+ if (null == batch || batch.isEmpty()) {
return;
}
[3/4] storm git commit: add STORM-1051 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1051 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/69c0a286
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/69c0a286
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/69c0a286
Branch: refs/heads/0.9.x-branch
Commit: 69c0a28624b0ce13afbc38a28a7d06ba5aa01af9
Parents: a58e30c
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Sep 21 07:02:26 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Sep 21 07:02:26 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/69c0a286/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57924a5..03a677f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.9.6
+ * STORM-1051: Netty Client.java's flushMessages produces a NullPointerException
* STORM-763: nimbus reassigned worker A to another machine, but other worker's netty client can't connect to the new worker A
* STORM-935: Update Disruptor queue version to 2.10.4
* STORM-503: Short disruptor queue wait time leads to high CPU usage when idle
[4/4] storm git commit: Merge branch 'STORM-1051-0.9.x' into
0.9.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-1051-0.9.x' into 0.9.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2468d830
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2468d830
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2468d830
Branch: refs/heads/0.9.x-branch
Commit: 2468d830c2ecd8933cd919eda459cc12440ae09f
Parents: 69c0a28 e681938
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Sep 21 07:02:50 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Sep 21 07:02:50 2015 +0900
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/messaging/netty/Client.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------