X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ctf%2Forg.eclipse.tracecompass.tmf.ctf.core%2Fsrc%2Forg%2Feclipse%2Ftracecompass%2Finternal%2Ftmf%2Fctf%2Fcore%2Ftrace%2Fiterator%2FCtfIteratorManager.java;h=b580652350586b3d35d953b7564f526c0621fa26;hb=202956f17e2fcea81218ac9852fbec320858077d;hp=fabde12231415c76c6aec14af6de319d71693a86;hpb=1ecce3d372bb26b0781bedba70692083f7bbc103;p=deliverable%2Ftracecompass.git

diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/internal/tmf/ctf/core/trace/iterator/CtfIteratorManager.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/internal/tmf/ctf/core/trace/iterator/CtfIteratorManager.java
index fabde12231..b580652350 100644
--- a/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/internal/tmf/ctf/core/trace/iterator/CtfIteratorManager.java
+++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core/src/org/eclipse/tracecompass/internal/tmf/ctf/core/trace/iterator/CtfIteratorManager.java
@@ -12,6 +12,8 @@
 
 package org.eclipse.tracecompass.internal.tmf.ctf.core.trace.iterator;
 
+import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -181,7 +183,7 @@ public class CtfIteratorManager {
             final int pos = fRnd.nextInt(size);
             final CtfTmfContext victim = fRandomAccess.get(pos);
             fRandomAccess.set(pos, context);
-            CtfIterator elem = fMap.remove(victim);
+            CtfIterator elem = checkNotNull(fMap.remove(victim));
             if (elem.isClosed()) {
                 /*
                  * In case the iterator streams have been closed, we need to