From 587f23e99de212547ed3938ade2ef8bc09855f75 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Wed, 12 May 2021 14:59:54 +0300 Subject: [PATCH] CB-963 Data read status message fix (NPE) --- .../src/io/cloudbeaver/service/sql/WebSQLProcessor.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java index ed1f5ac3ab..10db2e2e65 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java @@ -231,10 +231,13 @@ public class WebSQLProcessor { executeInfo.setDuration(statistics.getTotalTime()); WebSQLQueryResults results = new WebSQLQueryResults(webSession, dataFormat); - results.setResultSet(dataReceiver.getResultSet()); + WebSQLQueryResultSet resultSet = dataReceiver.getResultSet(); + results.setResultSet(resultSet); executeInfo.setResults(new WebSQLQueryResults[]{results}); - executeInfo.setStatusMessage(dataReceiver.getResultSet().getRows().length + " row(s) fetched"); + if (resultSet != null && resultSet.getRows() != null) { + executeInfo.setStatusMessage(resultSet.getRows().length + " row(s) fetched"); + } } catch (DBException e) { throw new InvocationTargetException(e); }