Repository: incubator-apex-core Updated Branches: refs/heads/release-3.2 be34b5e86 -> ed962c976
APEXCORE-363 - NPE in StreamingContainerManager. Skip null in the statistics list in case it was inserted as a result of incorrect CircularBuffer usage in the OperatorContext. Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/ed962c97 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/ed962c97 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/ed962c97 Branch: refs/heads/release-3.2 Commit: ed962c9769ed7948059a9b45d5c572c0dde8e6ba Parents: be34b5e Author: Vlad Rozov <[email protected]> Authored: Sun Feb 28 09:55:48 2016 -0800 Committer: Vlad Rozov <[email protected]> Committed: Sun Feb 28 09:55:48 2016 -0800 ---------------------------------------------------------------------- .../java/com/datatorrent/stram/StreamingContainerManager.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/ed962c97/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java b/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java index 29c6a2c..144be38 100644 --- a/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java +++ b/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java @@ -1558,6 +1558,10 @@ public class StreamingContainerManager implements PlanContext entry.getValue().recordingId = null; } for (ContainerStats.OperatorStats stats : statsList) { + if (stats == null) { + LOG.warn("Operator {} statistics list contains null element", shb.getNodeId()); + continue; + } /* report checkpoint-ed WindowId status of the operator */ if (stats.checkpoint instanceof Checkpoint) {
