dbeaver/pro#2424 NPE fix in virtual model read

dbeaver · Feb 2, 2024 · 5b17087 · 5b17087
1 parent 0393728
commit 5b17087
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/virtual/DBVEntityForeignKey.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/virtual/DBVEntityForeignKey.java
@@ -31,7 +31,6 @@
 import org.jkiss.dbeaver.model.struct.*;
 import org.jkiss.dbeaver.model.struct.rdb.DBSForeignKeyModifyRule;
 import org.jkiss.dbeaver.model.struct.rdb.DBSTableForeignKey;
-import org.jkiss.dbeaver.runtime.DBWorkbench;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -251,9 +250,9 @@ public DBPDataSourceContainer getAssociatedDataSource() {
             return null;
         }
         DBPProject project = getParentObject().getProject();
-        DBNModel navModel = DBWorkbench.getPlatform().getNavigatorModel();
+        DBNModel navModel = project.getNavigatorModel();
 
-        DBNDataSource dsNode = navModel.getDataSourceByPath(project, refEntityId);
+        DBNDataSource dsNode = navModel == null ? null : navModel.getDataSourceByPath(project, refEntityId);
         return dsNode == null ? null : dsNode.getDataSourceContainer();
     }