CB-4457. Fixed npe

dbeaver · Feb 12, 2024 · 9e79b53 · 9e79b53
1 parent 44e940d
commit 9e79b53
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/...bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryDataReceiver.java b/...bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryDataReceiver.java
@@ -84,14 +84,16 @@ public void fetchRow(DBCSession session, DBCResultSet resultSet) throws DBCExcep
                     binding.getMetaAttribute(),
                     i);
                 row[i] = cellValue;
-                Method[] methods = Objects.requireNonNull(cellValue).getClass().getMethods();
-                for (Method method : methods) {
-                    if (method.isAnnotationPresent(MetaData.class)){
-                        if (metaDataMap == null) {
-                            metaDataMap = new HashMap<>();
+                if (cellValue != null) {
+                    Method[] methods = cellValue.getClass().getMethods();
+                    for (Method method : methods) {
+                        if (method.isAnnotationPresent(MetaData.class)) {
+                            if (metaDataMap == null) {
+                                metaDataMap = new HashMap<>();
+                            }
+                            Object value = method.invoke(cellValue);
+                            metaDataMap.put(method.getAnnotation(MetaData.class).name(), value);
                         }
-                        Object value = method.invoke(cellValue);
-                        metaDataMap.put(method.getAnnotation(MetaData.class).name(), value);
                     }
                 }