From 52d9d1f6f1f9333da031fb998ee3b4accfdbbfc3 Mon Sep 17 00:00:00 2001
From: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Date: Wed, 29 Jul 2015 13:10:07 -0400
Subject: [PATCH 1/1] ss: Also clear the size of the TreeMapStore in its
 dispose()

Change-Id: I9c69017fea1fae562b8e693300672bdff7a5ad7b
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/52813
Reviewed-by: France Lapointe Nguyen <francelap@gmail.com>
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
---
 .../segmentstore/core/treemap/TreeMapStore.java             | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/segmentstore/core/treemap/TreeMapStore.java b/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/segmentstore/core/treemap/TreeMapStore.java
index c67d9ab15e..a013aa960b 100644
--- a/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/segmentstore/core/treemap/TreeMapStore.java
+++ b/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/segmentstore/core/treemap/TreeMapStore.java
@@ -44,7 +44,8 @@ public class TreeMapStore<T extends ISegment> implements ISegmentStore<T> {
     private final TreeMultimap<Long, T> fEndTimesIndex;
 
     private final Map<Long, T> fPositionMap;
-    private long fSize;
+
+    private volatile long fSize;
 
     /**
      *Constructor
@@ -100,10 +101,11 @@ public class TreeMapStore<T extends ISegment> implements ISegmentStore<T> {
     }
 
     @Override
-    public void dispose() {
+    public synchronized void dispose() {
         fStartTimesIndex.clear();
         fEndTimesIndex.clear();
         fPositionMap.clear();
+        fSize = 0;
     }
 
     // ------------------------------------------------------------------------
-- 
2.34.1