Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-Andre Laperle2014-09-02 00:11:22 +0000
committerMarc-Andre Laperle2014-09-10 04:50:38 +0000
commitb0fb8a5aa64c943410148889dfd8ca84dce88dd8 (patch)
treece59bd5833b48d560e6710ba0a290160ffd56586
parent2dc2d00f4cebae1e2c7229302abbc580957c437e (diff)
downloadorg.eclipse.linuxtools-b0fb8a5aa64c943410148889dfd8ca84dce88dd8.tar.gz
org.eclipse.linuxtools-b0fb8a5aa64c943410148889dfd8ca84dce88dd8.tar.xz
org.eclipse.linuxtools-b0fb8a5aa64c943410148889dfd8ca84dce88dd8.zip
ctf: Fix leak in CTFIteratorManager
Bug: 443643 Change-Id: I8fc12259b00b0b8e631e8a30590b38f8bcc0892b Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com> Reviewed-on: https://git.eclipse.org/r/32672 Tested-by: Hudson CI Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com> Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com> Reviewed-on: https://git.eclipse.org/r/33146
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfIteratorManager.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfIteratorManager.java b/lttng/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfIteratorManager.java
index a9c96f9c8b..7ca324f5eb 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfIteratorManager.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfIteratorManager.java
@@ -173,7 +173,9 @@ class CtfTraceManager {
}
public void removeIterator(CtfTmfContext context) {
- fMap.remove(context);
+ try (CtfIterator removed = fMap.remove(context)) {
+ }
+
fRandomAccess.remove(context);
}
@@ -213,6 +215,7 @@ class CtfTraceManager {
fRandomAccess.set(pos, context);
final CtfIterator elem = fMap.remove(victim);
fMap.put(context, elem);
+ victim.dispose();
return elem;
}

Back to the top