From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Mon, 8 Jun 2020 17:25:20 +0000 (+0300)
Subject: Fix stupid NPE from DiagramViewerLoadJob
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=a5ea1d2c1959b9aec22a73381efe11b9d162f684

Fix stupid NPE from DiagramViewerLoadJob

gitlab #550

Change-Id: I62acd0448f5ae8519d24f060ce0475e295b8a64a
(cherry picked from commit 291073d664e133feb7befd845f08f35502d92292)
---

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerLoadJob.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerLoadJob.java
index decf3356c..dc9d9d1be 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerLoadJob.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerLoadJob.java
@@ -111,8 +111,8 @@ public class DiagramViewerLoadJob extends DatabaseJob {
                         });
                         END(task);
                     } catch (Throwable t) {
-                        viewer = null;
                         LOGGER.error("Failed to complete loading of diagram {} in the canvas thread", viewer.diagramResource, t);
+                        viewer = null;
                     }
                 }
             });