Repository: incubator-apex-core
Updated Branches:
  refs/heads/master c2eb06c68 -> c6b3a925a


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/c6b3a925
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/c6b3a925
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/c6b3a925

Branch: refs/heads/master
Commit: c6b3a925a408e767796230ff54055fd2d9f19480
Parents: c2eb06c
Author: Vlad Rozov <[email protected]>
Authored: Sun Feb 28 09:55:48 2016 -0800
Committer: Thomas Weise <[email protected]>
Committed: Sun Feb 28 15:29:55 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/c6b3a925/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 0e7091b..ae79728 100644
--- a/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java
+++ b/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java
@@ -1570,6 +1570,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) {

Reply via email to