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 2016/08/22 11:17:22 UTC
[1/3] storm git commit: fixed SpoutExecutor NPE
Repository: storm
Updated Branches:
refs/heads/master 09bfca337 -> dad9db972
fixed SpoutExecutor NPE
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7cf7647e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7cf7647e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7cf7647e
Branch: refs/heads/master
Commit: 7cf7647e546201d3f175860526888cd92b3927b3
Parents: da5c3ac
Author: \u536b\u4e50 <we...@taobao.com>
Authored: Thu Aug 18 20:30:11 2016 +0800
Committer: \u536b\u4e50 <we...@taobao.com>
Committed: Thu Aug 18 20:30:11 2016 +0800
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7cf7647e/storm-core/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java b/storm-core/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java
index ba1c830..7a5066b 100644
--- a/storm-core/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java
+++ b/storm-core/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java
@@ -202,7 +202,7 @@ public class SpoutExecutor extends Executor {
Long id = (Long) tuple.getValue(0);
Long timeDeltaMs = (Long) tuple.getValue(1);
TupleInfo tupleInfo = (TupleInfo) pending.remove(id);
- if (tupleInfo.getMessageId() != null) {
+ if (tupleInfo != null && tupleInfo.getMessageId() != null) {
if (taskId != tupleInfo.getTaskId()) {
throw new RuntimeException("Fatal error, mismatched task ids: " + taskId + " " + tupleInfo.getTaskId());
}
[2/3] storm git commit: Merge branch 'executor-npe' of
https://github.com/unsleepy22/storm into STORM-2045
Posted by ka...@apache.org.
Merge branch 'executor-npe' of https://github.com/unsleepy22/storm into STORM-2045
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a507899d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a507899d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a507899d
Branch: refs/heads/master
Commit: a507899d5b2706ecca16420e082aa351864603ca
Parents: 09bfca3 7cf7647
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Aug 22 20:16:32 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Aug 22 20:16:32 2016 +0900
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] storm git commit: add STORM-2045 to CHANGELOG
Posted by ka...@apache.org.
add STORM-2045 to CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/dad9db97
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dad9db97
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dad9db97
Branch: refs/heads/master
Commit: dad9db9729c76365f04159b7656fc4e0011de831
Parents: a507899
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Aug 22 20:17:04 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Aug 22 20:17:04 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/dad9db97/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 714be9a..fab17b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 2.0.0
+ * STORM-2045: fixed SpoutExecutor NPE
* STORM-2041: Make Java 8 as minimum requirement for 2.0 release
* STORM-1256: port backtype.storm.utils.ZookeeperServerCnxnFactory-test to java
* STORM-1251: port backtype.storm.serialization.SerializationFactory-test to java