From 118a5d07118a37dec3073190f73749cd84dd94d9 Mon Sep 17 00:00:00 2001 From: Mathieu Denis Date: Fri, 29 Jun 2012 15:21:16 -0400 Subject: [PATCH] Fix for bug 382438: null pointer exception when closing statistics view --- .../tmf/ui/views/statistics/TmfStatisticsView.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java index 48e6ecb92a..e091402653 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java @@ -245,6 +245,8 @@ public class TmfStatisticsView extends TmfView { fWaitCursor.dispose(); } + // Make sure there is no request running before removing the statistics tree + cancelOngoingRequest(); // clean the model TmfStatisticsTreeRootFactory.removeAll(); } @@ -500,12 +502,12 @@ public class TmfStatisticsView extends TmfView { // Preparation of the event request fRequest = new TmfEventRequest(ITmfEvent.class, timeRange, index, TmfDataRequest.ALL_DATA, getIndexPageSize(), ExecutionType.BACKGROUND) { + private final AbsTmfStatisticsTree statisticsData = TmfStatisticsTreeRootFactory.getStatTree(getTreeID(experiment.getName())); + @Override public void handleData(ITmfEvent data) { super.handleData(data); if (data != null) { - AbsTmfStatisticsTree statisticsData = TmfStatisticsTreeRootFactory.getStatTree(getTreeID(experiment.getName())); - final String traceName = data.getTrace().getName(); ITmfExtraEventInfo extraInfo = new ITmfExtraEventInfo() { @Override -- 2.34.1