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 fc629bdb0cc99bcdb71cf17ebb03c1d568f47375..387b3a41a98db39dc506107d9932871f33431dfb 100644 (file)
--- 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)