From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Thu, 22 Sep 2016 16:16:51 +0000 (-0400)
Subject: ss: historyTreeFile can be null
X-Git-Url: http://git.efficios.com/?p=deliverable%2Ftracecompass.git;a=commitdiff_plain;h=6305377c1b83226c3a0e7ac962ef7d2534edd785

ss: historyTreeFile can be null

The HistoryTreeBackend constructor signature does not accept
null values as second argument.

Change-Id: I8772d494966d76f7827d9cbfd37a48d28958dc4c
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Reviewed-on: https://git.eclipse.org/r/81923
Reviewed-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Tested-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Reviewed-by: Hudson CI
---

diff --git a/statesystem/org.eclipse.tracecompass.statesystem.core.tests/src/org/eclipse/tracecompass/statesystem/core/tests/backend/HistoryTreeBackendTest.java b/statesystem/org.eclipse.tracecompass.statesystem.core.tests/src/org/eclipse/tracecompass/statesystem/core/tests/backend/HistoryTreeBackendTest.java
index 0d3b59eb33..a33715ad6b 100644
--- a/statesystem/org.eclipse.tracecompass.statesystem.core.tests/src/org/eclipse/tracecompass/statesystem/core/tests/backend/HistoryTreeBackendTest.java
+++ b/statesystem/org.eclipse.tracecompass.statesystem.core.tests/src/org/eclipse/tracecompass/statesystem/core/tests/backend/HistoryTreeBackendTest.java
@@ -9,6 +9,8 @@
 
 package org.eclipse.tracecompass.statesystem.core.tests.backend;
 
+import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
@@ -89,7 +91,7 @@ public class HistoryTreeBackendTest extends StateHistoryBackendTestBase {
 
     @Override
     protected IStateHistoryBackend getBackendForBuilding(long startTime) throws IOException {
-        File historyTreeFile = File.createTempFile("HistoryTreeBackendTest", ".ht");
+        File historyTreeFile = checkNotNull(File.createTempFile("HistoryTreeBackendTest", ".ht"));
         fHistoryTreeFiles.add(historyTreeFile);
         HistoryTreeBackend backend = new HistoryTreeBackend(SSID, historyTreeFile, PROVIDER_VERSION, startTime, fBlockSize, fMaxChildren);
         fBackendMap.put(backend, historyTreeFile);
@@ -101,7 +103,13 @@ public class HistoryTreeBackendTest extends StateHistoryBackendTestBase {
         if (!fReOpen) {
             return backend;
         }
+
         File historyTreeFile = fBackendMap.remove(backend);
+
+        if (historyTreeFile == null) {
+            throw new IllegalStateException();
+        }
+
         backend.dispose();
         HistoryTreeBackend reOpenedBackend = new HistoryTreeBackend(SSID, historyTreeFile, PROVIDER_VERSION);
         fBackendMap.put(reOpenedBackend, historyTreeFile);