#7486 Generic driver: isolated context init fix

947ff581 · serge-rider · 2da1a9e7 · 947ff581
隐藏空白更改
内联并排

Showing with 2 addition and 4 deletion

plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericExecutionContext.java ...ss/dbeaver/ext/generic/model/GenericExecutionContext.java +2 -4

未找到文件。
--- a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericExecutionContext.java
+++ b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericExecutionContext.java
@@ -135,11 +135,9 @@ public class GenericExecutionContext extends JDBCExecutionContext implements DBC
            entityName = defaultCatalog.getName();
        } else if (context.supportsSchemaChange()) {
            GenericSchema defaultSchema = context.getDefaultSchema();
-            entityName = defaultSchema.getName();
+            entityName = defaultSchema == null ? null : defaultSchema.getName();
        }
-        if (entityName == null) {
-            log.error("Can't determine default entity type");
-        } else {
+        if (entityName != null) {
            GenericDataSource dataSource = getDataSource();
            try (JDBCSession session = openSession(monitor, DBCExecutionPurpose.UTIL, "Set active catalog")) {
                if (dataSource.isSelectedEntityFromAPI()) {