#1771 Check and create an association asynchronously

dbeaver · Sep 26, 2022 · 9bbee20 · 9bbee20
1 parent 1e3c543
commit 9bbee20
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDGraphicalViewer.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDGraphicalViewer.java
@@ -393,15 +393,15 @@ public void handleDataSourceEvent(DBPEvent event)
                 } else if (entityAssociation != null) {
                     ERDEntity erdEntity = diagram.getEntity(entity);
                     ERDEntity targetEntity = diagram.getEntity(entityAssociation.getAssociatedEntity());
-                    if (erdEntity != null &&
-                        erdEntity.getAssociation(entityAssociation) == null &&
-                        erdEntity.getReferenceAssociation(entityAssociation) == null)
-                    {
-                        DBSEntityAssociation addedAssociation = entityAssociation;
-                        UIUtils.asyncExec(() -> {
+                    DBSEntityAssociation addedAssociation = entityAssociation;
+                    UIUtils.asyncExec(() -> {
+                        if (erdEntity != null &&
+                            erdEntity.getAssociation(addedAssociation) == null &&
+                            erdEntity.getReferenceAssociation(addedAssociation) == null)
+                        {
                             new ERDAssociation(addedAssociation, erdEntity, targetEntity, true);
-                        });
-                    }
+                        }
+                    });
                 } else {
                     // New entity. Add it if it has the same object container
                     // or if this entity was created from the same editor