From de7e757c2bea19fca0399a494a5ace67bf867a06 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 18 Jan 2023 20:32:46 +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 c553770ab2..1de94b8c85 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().getName().equals(node.getName())
+                            contextDefaults.getDefaultCatalog() != null && contextDefaults.getDefaultCatalog().getName().equals(node.getName())
                             || node.getName().equals(catalog)
                         )
                     ) {