From bf541bc5db00379bc5e8442516ecb8f289fde99e Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Tue, 21 Apr 2020 15:43:46 +0300
Subject: [PATCH] NPE fix

---
 .../server/model/sql/WebSQLProcessor.java            | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/model/sql/WebSQLProcessor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/model/sql/WebSQLProcessor.java
index 59b217fe2e..924a8123e2 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/model/sql/WebSQLProcessor.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/model/sql/WebSQLProcessor.java
@@ -399,12 +399,14 @@ public class WebSQLProcessor {
             // ignore
         }
         WebStructContainers structContainers = new WebStructContainers();
-        for (DBSObject node : reader.getObjectList()) {
-            if (!dataSource.getContainer().getNavigatorSettings().isShowSystemObjects() && DBUtils.isSystemObject(node)) {
-                continue;
+        if (!CommonUtils.isEmpty(reader.getObjectList())) {
+            for (DBSObject node : reader.getObjectList()) {
+                if (!dataSource.getContainer().getNavigatorSettings().isShowSystemObjects() && DBUtils.isSystemObject(node)) {
+                    continue;
+                }
+                List<WebDatabaseObjectInfo> objectInfos = node instanceof DBSCatalog ? structContainers.getCatalogList() : structContainers.getSchemaList();
+                objectInfos.add(new WebDatabaseObjectInfo(webSession, node));
             }
-            List<WebDatabaseObjectInfo> objectInfos = node instanceof DBSCatalog ? structContainers.getCatalogList() : structContainers.getSchemaList();
-            objectInfos.add(new WebDatabaseObjectInfo(webSession, node));
         }
         return structContainers;
     }