From 88d10130ac88a2cba3cb3b4640d194790fe97d2b Mon Sep 17 00:00:00 2001 From: serge-rider Date: Wed, 18 Jan 2023 20:34:47 +0300 Subject: [PATCH] CB-3077 NPE in schema selector fix --- .../cloudbeaver/service/navigator/impl/WebServiceNavigator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java index 1de94b8c85..26dc034c89 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java @@ -269,7 +269,7 @@ public class WebServiceNavigator implements DBWServiceNavigator { if ( contextDefaults != null && contextDefaults.supportsSchemaChange() && ( - contextDefaults.getDefaultCatalog() != null && contextDefaults.getDefaultCatalog().getName().equals(node.getName()) + (contextDefaults.getDefaultCatalog() != null && contextDefaults.getDefaultCatalog().getName().equals(node.getName())) || node.getName().equals(catalog) ) ) {