From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Wed, 29 May 2019 10:03:23 +0000 (+0000)
Subject: Merge "Diagram loading concurrency problem with Sysdyn"
X-Git-Tag: v1.43.0~136^2~150
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=ddd1f416671666c81fe5c5766c9f1b0b133b1c5c;hp=691db89ccddae3006529c229c829dd2fd027c35c

Merge "Diagram loading concurrency problem with Sysdyn"
---

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/services/ComponentNamingUtil.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/services/ComponentNamingUtil.java
index fc629bdb0..387b3a41a 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/services/ComponentNamingUtil.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/services/ComponentNamingUtil.java
@@ -189,7 +189,7 @@ public final class ComponentNamingUtil {
         if (containerGeneratedNamePrefix != null)
             proposition.append(containerGeneratedNamePrefix);
         String componentPrefix = graph.getPossibleRelatedValue(componentType, L0X.HasGeneratedNamePrefix, Bindings.STRING);
-        if (componentPrefix == null) {
+        if (componentPrefix == null || "".equals(componentPrefix)) {
             Layer0 L0 = Layer0.getInstance(graph);
             componentPrefix = graph.getPossibleRelatedValue(componentType, L0.HasName);
             if (componentPrefix == null)