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: å«ä¹ <[email protected]> Authored: Thu Aug 18 20:30:11 2016 +0800 Committer: å«ä¹ <[email protected]> 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()); }
