Merge changes I78c3a258,I7bf72f04

[simantics/platform.git] / bundles / org.simantics.simulation / src / org / simantics / simulation / history / HistoryUtil.java

diff --git a/bundles/org.simantics.simulation/src/org/simantics/simulation/history/HistoryUtil.java b/bundles/org.simantics.simulation/src/org/simantics/simulation/history/HistoryUtil.java
index 39c084cad4dd5f89c711c480cfeaeef983d542da..343adefc8686fc2053b6c4b41e9167d0e937372d 100644 (file)
--- a/bundles/org.simantics.simulation/src/org/simantics/simulation/history/HistoryUtil.java
+++ b/bundles/org.simantics.simulation/src/org/simantics/simulation/history/HistoryUtil.java
@@ -68,6 +68,8 @@ import org.simantics.simulation.Activator;
 import org.simantics.simulation.ontology.HistoryResource;
 import org.simantics.simulation.ontology.SimulationResource;
 import org.simantics.utils.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import gnu.trove.map.TObjectLongMap;
 import gnu.trove.map.hash.TObjectLongHashMap;
@@ -80,6 +82,8 @@ import net.jpountz.lz4.LZ4BlockOutputStream;
  */
 public class HistoryUtil {
 
+       private static final Logger LOGGER = LoggerFactory.getLogger(HistoryUtil.class);
+
        private static final boolean DEBUG = false;
        private static final boolean PROFILE = true;
 
@@ -663,6 +667,9 @@ public class HistoryUtil {
                try (RandomAccessBinary rab = new BinaryFile(path.toFile())) {
                        importHistoryArchive(history, rab, result);
                        return result;
+               } catch (IOException e) {
+                       LOGGER.error("Failed to import history from archive {}", path);
+                       throw e;
                }
        }